Pull request #13485: REPORT-111995 【UI翻新】翻新公式面板、补充部分图标

Merge in DESIGN/design from ~LEVY.XIE/design:newui to newui

* commit 'fab38a8c33e00943fd5d7f5216cb981936ca6e06':
  REPORT-111995 【UI翻新】翻新公式面板、补充部分图标

designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java

@@ -171,10 +171,14 @@ public class FineLightIconSet extends AbstractIconSet {
                 new SvgIconSource("tool_copy", "com/fine/theme/icon/toolbar/copy.svg", true),
                 new SvgIconSource("move_down", "com/fine/theme/icon/toolbar/move_down.svg", true),
                 new SvgIconSource("move_up", "com/fine/theme/icon/toolbar/move_up.svg", true),
+                new SvgIconSource("move_left", "com/fine/theme/icon/toolbar/move_left.svg", true),
+                new SvgIconSource("move_right", "com/fine/theme/icon/toolbar/move_right.svg", true),
                 new SvgIconSource("tool_edit", "com/fine/theme/icon/toolbar/edit.svg", true),
                 new SvgIconSource("tool_edit_white", "com/fine/theme/icon/toolbar/edit_white.svg", true),
                 new SvgIconSource("tool_more", "com/fine/theme/icon/toolbar/more.svg", true),
                 new SvgIconSource("tool_more_hover", "com/fine/theme/icon/toolbar/more_hover.svg"),
+                new SvgIconSource("tool_config", "com/fine/theme/icon/toolbar/config.svg", true),
+                new SvgIconSource("add_popup", "com/fine/theme/icon/toolbar/add_popup.svg", true, 24),
 
                 // 参数面板
                 new SvgIconSource("param_edit", "com/fine/theme/icon/param/edit.svg", true, 24),
@@ -182,6 +186,7 @@ public class FineLightIconSet extends AbstractIconSet {
                 new SvgIconSource("param_hide", "com/fine/theme/icon/param/hide.svg", true, 24),
                 new SvgIconSource("param_hide_pressed", "com/fine/theme/icon/param/hide_pressed.svg", true, 24),
                 new SvgIconSource("param_view", "com/fine/theme/icon/param/view.svg", true, 18),
+                new SvgIconSource("param", "com/fine/theme/icon/param/param.svg", true),
 
                 // 北区菜单栏
                 new SvgIconSource("notification", "com/fine/theme/icon/notification/notification.svg"),

designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java

@@ -228,7 +228,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
     private TreeSearchToolbarPane initToolBarPane() {
         // toolbar
         addMenuDef = new MenuDef(Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
-        addMenuDef.setDisabledIcon("/com/fr/design/standard/addpopup/addPopup", true);
+        addMenuDef.setIcon(new LazyIcon("add_popup"));
         createAddMenuDef();
         // 创建插件监听
         createPluginListener();

designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@@ -1,5 +1,9 @@
 package com.fr.design.dialog;
 
+import com.fine.swing.ui.layout.Layouts;
+import com.fine.theme.utils.FineUIStyle;
+import com.formdev.flatlaf.util.ScaledEmptyBorder;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.utils.gui.GUICoreUtils;
@@ -77,8 +81,8 @@ public abstract class UIDialog extends JDialog {
 
     private void initComponents(boolean isNeedButtonPane) {
         JPanel contentPane = (JPanel) this.getContentPane();
-        contentPane.setBorder(BorderFactory.createEmptyBorder(2, 4, 4, 4));
+        contentPane.setBorder(new ScaledEmptyBorder(10, 10, 10, 10));
-        contentPane.setLayout(new BorderLayout(0, 4));
+        contentPane.setLayout(new BorderLayout(0, 10));
         this.applyClosingAction();
         this.applyEscapeAction();
         contentPane.add(pane, BorderLayout.CENTER);
@@ -94,7 +98,7 @@ public abstract class UIDialog extends JDialog {
     private JPanel createControlButtonPane() {
         JPanel controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
-        JPanel buttonsPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 10, 0));
+        JPanel buttonsPane = Layouts.row(LayoutConstants.HORIZONTAL_GAP).getComponent();
         controlPane.add(buttonsPane, BorderLayout.EAST);
 
         //增加一个自定义按钮, 可以用于eg: 设为全局配置
@@ -148,6 +152,7 @@ public abstract class UIDialog extends JDialog {
         okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK"));
         okButton.setName(OK_BUTTON);
         okButton.setMnemonic('O');
+        FineUIStyle.setStyle(okButton, FineUIStyle.STYLE_PRIMARY);
         buttonsPane.add(okButton);
         okButton.addActionListener(new ActionListener() {
 

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -1,5 +1,10 @@
 package com.fr.design.formula;
 
+import com.fine.swing.ui.layout.Layouts;
+import com.fine.theme.icon.LazyIcon;
+import com.fine.theme.light.ui.FineRoundBorder;
+import com.fine.theme.utils.FineUIScale;
+import com.formdev.flatlaf.ui.FlatUIUtils;
 import com.fr.base.BaseFormula;
 import com.fr.base.BaseUtils;
 import com.fr.base.Parameter;
@@ -10,6 +15,7 @@ import com.fr.base.io.IOFile;
 import com.fr.data.TableDataSource;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.border.UIRoundedBorder;
+import com.fr.design.constants.LayoutConstants;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.BasicPane;
@@ -66,7 +72,7 @@ import com.fr.stable.script.Tiny;
 import com.fr.stable.script.TinyHunter;
 
 import java.awt.Window;
-import javax.swing.BorderFactory;
+import javax.swing.SwingConstants;
 import javax.swing.DefaultListCellRenderer;
 import javax.swing.DefaultListModel;
 import javax.swing.Icon;
@@ -92,7 +98,6 @@ import java.awt.BorderLayout;
 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;
 import java.awt.event.FocusEvent;
@@ -120,6 +125,10 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
+import static com.fine.swing.ui.layout.Layouts.row;
+import static com.fine.swing.ui.layout.Layouts.cell;
+import static com.fine.swing.ui.layout.Layouts.flex;
+
 /**
  * 公式编辑面板
  *
@@ -128,13 +137,11 @@ import java.util.Set;
  */
 @EnableMetrics
 public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
-    public static final int DEFUAL_FOMULA_LENGTH = 103;
+    public static final int DEFUAL_FOMULA_LENGTH = FineUIScale.scale(103);
     public static final String ELLIPSIS = "...";
     public static final char KEY_CODE_A = 'A';
     public static final char KEY_CODE_Z = 'z';
     public static final String NEWLINE = "\n";
-    public static final String FORMULA_ICON = "/com/fr/design/images/m_file/formula.png";
-    public static final String PARAM_ICON = "/com/fr/design/images/m_file/param.png";
     private VariableTreeAndDescriptionArea variableTreeAndDescriptionArea;
     private RSyntaxTextArea formulaTextArea;
     private UITextField keyWordTextField = new UITextField(18);
@@ -156,8 +163,6 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     private DefaultCompletionProvider completionProvider;
     private static final Map<String, String> PARAM_PREFIX_MAP = new HashMap<>();
 
-    public static final int DESCRIPTION_TEXT_AREA_ROW = 16, DESCRIPTION_TEXT_AREA_COLUMN = 27;
-
     public FormulaPane() {
         initComponents();
     }
@@ -255,26 +260,17 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         });
     }
 
-    private void initTipsPane() {
+    private JPanel initTipsPane() {
         // tipsPane
-        JPanel containerSPane = new JPanel(new BorderLayout(4, 1));
-        JPanel labelPane = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0), true);
-        JPanel searchPane = new JPanel(new FlowLayout(FlowLayout.RIGHT, 0, 0), true);
-        containerSPane.setPreferredSize(new Dimension(892, 23));
-        this.add(containerSPane, BorderLayout.NORTH);
-
         UIButton searchButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Search"));
         UILabel formulaLabel = new UILabel(
-                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":");
+                com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Input_Formula_In_The_Text_Area_Below") + ":", SwingConstants.LEFT);
-        formulaLabel.setBorder(BorderFactory.createEmptyBorder(4, 4, 4, 4));
+        JPanel containerSPane = row(
-
+                cell(formulaLabel),
-        labelPane.add(formulaLabel, BorderLayout.WEST);
+                flex(),
-        keyWordTextField.setPreferredSize(new Dimension(240, 23));
+                cell(keyWordTextField),
-        searchPane.add(keyWordTextField, BorderLayout.EAST);
+                cell(searchButton)
-        searchPane.add(searchButton, BorderLayout.EAST);
+        ).getComponent();
-
-        containerSPane.add(labelPane, BorderLayout.WEST);
-        containerSPane.add(searchPane, BorderLayout.EAST);
 
         initKeyWordTextFieldKeyListener();
         tipsList = new JList(listModel);
@@ -288,14 +284,22 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 fixFunctionNameList(tipsList.getSelectedValue().toString());
             }
         });
+
+        return containerSPane;
     }
 
     protected void initComponents() {
-        this.setLayout(new BorderLayout(4, 4));
+        this.setLayout(new BorderLayout());
 
-        initTextPane();
+        JPanel textPane = initTextPane();
-        initTipsPane();
+        JPanel tipsPane = initTipsPane();
-        initVariableTreeAndDescriptionArea();
+        JPanel variablePane = initVariableTreeAndDescriptionArea();
+
+        this.add(Layouts.column(LayoutConstants.VERTICAL_GAP,
+                cell(tipsPane),
+                cell(textPane).weight(1),
+                cell(variablePane).weight(2)
+        ).getComponent());
         refocusInWindow();
     }
 
@@ -303,37 +307,31 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         SwingUtilities.invokeLater(() -> formulaTextArea.requestFocusInWindow());
     }
 
-    private void initVariableTreeAndDescriptionArea() {
+    private JPanel initVariableTreeAndDescriptionArea() {
         variableTreeAndDescriptionArea = new VariableTreeAndDescriptionArea();
-        this.add(variableTreeAndDescriptionArea, BorderLayout.SOUTH);
+        return variableTreeAndDescriptionArea;
     }
 
-    private void initTextPane() {
+    private JPanel initTextPane() {
+        JPanel textPane = new JPanel(new BorderLayout(0, LayoutConstants.VERTICAL_GAP));
+        JPanel checkBoxAndButtonPane = new JPanel(new BorderLayout());
+
         // text
-        JPanel textPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        this.add(textPane, BorderLayout.CENTER);
-        JPanel checkBoxandbuttonPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
         initFormulaTextArea();
-
         UIScrollPane formulaTextAreaScrollPane = new UIScrollPane(formulaTextArea);
-        formulaTextAreaScrollPane.setBorder(null);
+        formulaTextAreaScrollPane.setBorder(new FineRoundBorder());
-        textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER);
-        textPane.add(checkBoxandbuttonPane, BorderLayout.SOUTH);
-
 
+        // buttonPane
+        JPanel buttonPane = row(8).getComponent();
         UIButton checkValidButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Check_Valid"));
         UIButton calButton = new UIButton(Toolkit.i18nText("Fine-Design_Basic_Formula_Cal_Button"));
         checkValidButton.addActionListener(checkValidActionListener);
         calButton.addActionListener(calculateActionListener);
+        buttonPane.add(checkValidButton);
+        buttonPane.add(calButton);
 
-        //靠左流式布局
+        // checkBoxPane
-        JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
+        JPanel checkBoxPane = row(8).getComponent();
-        checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.WEST);
-        //靠右流式布局
-        JPanel buttonPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane();
-        buttonPane.add(checkValidButton, BorderLayout.EAST);
-        buttonPane.add(calButton, BorderLayout.EAST);
-        checkBoxandbuttonPane.add(buttonPane, BorderLayout.EAST);
         if (autoCompletionCheck == null) {
             autoCompletionCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Formula_AutoCompletion"));
             autoCompletionCheck.setSelected(true);
@@ -342,10 +340,16 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             checkBeforeColse = new UICheckBox(Toolkit.i18nText("Fine-Design_Basic_Formula_Check_Before_Closed"));
             checkBeforeColse.setSelected(true);
         }
-        checkBoxPane.add(autoCompletionCheck, BorderLayout.WEST);
+        checkBoxPane.add(autoCompletionCheck);
-        checkBoxPane.add(checkBeforeColse, BorderLayout.WEST);
+        checkBoxPane.add(checkBeforeColse);
         extendCheckBoxPane(checkBoxPane);
 
+        // layout
+        checkBoxAndButtonPane.add(checkBoxPane, BorderLayout.WEST);
+        checkBoxAndButtonPane.add(buttonPane, BorderLayout.EAST);
+        textPane.add(formulaTextAreaScrollPane, BorderLayout.CENTER);
+        textPane.add(checkBoxAndButtonPane, BorderLayout.SOUTH);
+
         ParameterTableModel model = new ParameterTableModel(0);
         editor4CalPane = new UITableEditorPane<>(model);
         formulaTextArea.addFocusListener(new FocusListener() {
@@ -363,6 +367,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 uninstallAutoCompletion();
             }
         });
+        return textPane;
     }
 
     private CompletionProvider createCompletionProvider() {
@@ -370,7 +375,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             completionProvider = new DefaultCompletionProvider();
             NameAndDescription[] nameAndDescriptions = FunctionConstants.ALL.getDescriptions();
             for (NameAndDescription nameAndDescription : nameAndDescriptions) {
-                completionProvider.addCompletion(new FormulaCompletion(completionProvider, nameAndDescription.getName(), BaseUtils.readIcon(FORMULA_ICON)));
+                completionProvider.addCompletion(new FormulaCompletion(completionProvider, nameAndDescription.getName(), new LazyIcon("formula")));
             }
 
             VariableResolver variableResolver = VariableResolver.DEFAULT;
@@ -394,7 +399,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     paramWithoutPre = parameter;
                     PARAM_PREFIX_MAP.put(paramWithoutPre, StringUtils.EMPTY);
                 }
-                completionProvider.addCompletion(new FormulaCompletion(completionProvider, paramWithoutPre, BaseUtils.readIcon(PARAM_ICON)));
+                completionProvider.addCompletion(new FormulaCompletion(completionProvider, paramWithoutPre, new LazyIcon("param")));
             }
 
             return completionProvider;
@@ -645,7 +650,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         popupMenu = new JPopupMenu();
         JScrollPane tipsScrollPane = new JScrollPane(tipsList);
         popupMenu.add(tipsScrollPane);
-        tipsScrollPane.setPreferredSize(new Dimension(240, 146));
+        tipsScrollPane.setPreferredSize(new Dimension(FineUIScale.scale(240), FineUIScale.scale(146)));
         tipsScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
         popupMenu.show(keyWordTextField, 0, 23);
     }
@@ -742,8 +747,10 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
     }
 
     public BasicDialog showLargeWindow(Window window, DialogActionListener l) {
-        BasicDialog basicDialog = super.showWindowWithCustomSize(window, l, new Dimension(900, 600));
+        int width = FineUIScale.scale(900);
-        basicDialog.setMinimumSize(new Dimension(900, 600));
+        int height = FineUIScale.scale(600);
+        BasicDialog basicDialog = super.showWindowWithCustomSize(window, l, new Dimension(width, height));
+        basicDialog.setMinimumSize(new Dimension(width, height));
         basicDialog.setResizable(true);
         return basicDialog;
     }
@@ -1066,15 +1073,15 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             this.initComponents();
         }
 
-        private void initFunctionTypeList(JPanel functionPane) {
+        private JPanel initFunctionTypeList() {
             functionTypeList = new QuickList(functionTypeListModel);
             UIScrollPane functionTypeScrollPane = new UIScrollPane(functionTypeList);
-            functionTypeScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+            functionTypeScrollPane.setBorder(new FineRoundBorder());
-            functionTypeScrollPane.setPreferredSize(new Dimension(140, 200));
+            functionTypeList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
-            functionPane.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category") + ":", functionTypeScrollPane), BorderLayout.WEST);
             initTypeListCellRenderer();
             initGroupTypeModel();
             initTypeListSelectionListener();
+            return this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Category"), functionTypeScrollPane);
         }
 
         private void initTypeListCellRenderer() {
@@ -1181,23 +1188,21 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             });
         }
 
-        private void initFunctionNameList(JPanel functionPane) {
+        private JPanel initFunctionNameList() {
             functionNameList = new JList(new DefaultListModel());
             UIScrollPane functionNameScrollPane = new UIScrollPane(functionNameList);
-            functionNameScrollPane.setPreferredSize(new Dimension(140, 200));
+            functionNameScrollPane.setBorder(new FineRoundBorder());
-            functionPane.add(
+            functionNameList.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
-                    this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name") + ":", functionNameScrollPane),
-                    BorderLayout.CENTER);
-            functionNameScrollPane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
             initFunctionNameListCellRenderer();
             initFunctionNameListSelectionListener();
             initFunctionNameListMouseListener();
+            return this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Function_Name"), functionNameScrollPane);
         }
 
         private void initDescriptionTextArea() {
             // Description
-            descriptionTextArea = new UITextArea(DESCRIPTION_TEXT_AREA_ROW,DESCRIPTION_TEXT_AREA_COLUMN);
+            descriptionTextArea = new UITextArea();
-            descriptionTextArea.setBackground(Color.white);
+            descriptionTextArea.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
             descriptionTextArea.setLineWrap(true);
             descriptionTextArea.setWrapStyleWord(true);
             descriptionTextArea.setEditable(false);
@@ -1263,14 +1268,12 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
 
 
-        private void initVariablesTree() {
+        private JPanel initVariablesTree() {
-            JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+            // variable
-            // vairable.
             variablesTree = new JTree();
             UIScrollPane variablesTreePane = new UIScrollPane(variablesTree);
-            variablesTreePane.setBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, UIConstants.ARC));
+            variablesTreePane.setBorder(new FineRoundBorder());
-            panel.add(this.createNamePane(
+            variablesTree.setBackground(FlatUIUtils.getUIColor("background.normal", Color.WHITE));
-                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables") + ":", variablesTreePane), BorderLayout.WEST);
             variablesTree.setRootVisible(false);
             variablesTree.setShowsRootHandles(true);
             variablesTree.addMouseListener(applyTextMouseListener);
@@ -1280,23 +1283,34 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
 
             UIScrollPane desScrollPane = new UIScrollPane(descriptionTextArea);
             desScrollPane.setBorder(null);
-            panel.add(this.createNamePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description") + ":", desScrollPane), BorderLayout.CENTER);
             initVariablesTreeSelectionListener();
-            this.add(panel,BorderLayout.CENTER);
+            return Layouts.row(LayoutConstants.HORIZONTAL_GAP,
+                    cell(this.createNamePane(
+                            Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Variables"), variablesTreePane)
+                    ).weight(1),
+                    cell(this.createNamePane(
+                            Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Formula_Description"), desScrollPane)
+                    ).weight(1)
+            ).getComponent();
         }
 
         private void initComponents() {
-            this.setLayout(new BorderLayout(4, 4));
+            this.setLayout(new BorderLayout());
-            initVariablesTree();
+            JPanel variablesTreePane = initVariablesTree();
-            initFunctionPane();
+            JPanel functionPane = initFunctionPane();
-        }
+            this.add(Layouts.row(LayoutConstants.HORIZONTAL_GAP,
-
+                    cell(functionPane).weight(1),
-        private void initFunctionPane() {
+                    cell(variablesTreePane).weight(2)
-            JPanel functionPane = new JPanel(new BorderLayout(4, 4));
+            ).getComponent());
-            this.add(functionPane, BorderLayout.WEST);
+        }
-            initFunctionTypeList(functionPane);
+
-            initFunctionNameList(functionPane);
+        private JPanel initFunctionPane() {
+            JPanel functionTypePane = initFunctionTypeList();
+            JPanel functionNamePane = initFunctionNameList();
             functionTypeList.setSelectedIndex(0);
+            return Layouts.row(LayoutConstants.HORIZONTAL_GAP,
+                    cell(functionTypePane).weight(1), cell(functionNamePane).weight(1)
+            ).getComponent();
         }
 
         @Override
@@ -1312,7 +1326,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
             public LookDetailAction() {
                 this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaPane_Function_Detail"));
                 this.setMnemonic('L');
-                this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/preview.png"));
+                this.setSmallIcon(new LazyIcon("preview"));
             }
 
             // 弹出的窗口中显示函数的用法明细
@@ -1345,7 +1359,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
         }
 
         private JPanel createNamePane(String name, JComponent comp) {
-            JPanel namePane = new JPanel(new BorderLayout(4, 4));
+            JPanel namePane = new JPanel(new BorderLayout(0, 4));
             namePane.add(new UILabel(name), BorderLayout.NORTH);
             namePane.add(comp, BorderLayout.CENTER);
             return namePane;
@@ -1419,7 +1433,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                 DefaultMutableTreeNode bindCellNode = new DefaultMutableTreeNode(new TextUserObject("$$$"));
                 rootNode.add(bindCellNode);
             }
-
+            // todo: 缺一些icon
             rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_FormulaD_Data_Fields"),
                     BaseUtils.readIcon("/com/fr/design/images/dialog/table.png"),
                     variableResolver.resolveColumnNames()).createMutableTreeNode());
@@ -1434,7 +1448,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     variableResolver.resolveTableDataParameterVariables()).createMutableTreeNode());
 
             rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_ParameterD_Report_Parameter"),
-                    BaseUtils.readIcon("/com/fr/design/images/m_report/p.gif"),
+                    new LazyIcon("param"),
                     variableResolver.resolveReportParameterVariables()).createMutableTreeNode());
 
             rootNode.add(new TextFolderUserObject(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Server_Global_Parameters"),

designer-base/src/main/java/com/fr/design/formula/FormulaPaneWhenReserveFormula.java

@@ -40,8 +40,8 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane {
         reserveCheckBox4Write = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Write_Save_Formula"));
         reserveCheckBox4Write.setSelected(false);
 
-        checkBoxPane.add(reserveCheckBox4Result, BorderLayout.WEST);
+        checkBoxPane.add(reserveCheckBox4Result);
-        checkBoxPane.add(reserveCheckBox4Write, BorderLayout.WEST);
+        checkBoxPane.add(reserveCheckBox4Write);
     }
 
     @Override

designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/OldShortCutFactory.java

@@ -1,5 +1,6 @@
 package com.fr.design.gui.controlpane.shortcutfactory;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.gui.controlpane.NameableCreator;
@@ -63,7 +64,7 @@ public class OldShortCutFactory extends AbstractShortCutFactory {
             this.creator = creators[0];
             this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Add")));
             this.setMnemonic('A');
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
+            this.setSmallIcon(new LazyIcon("add"));
         }
 
         @Override
@@ -79,7 +80,7 @@ public class OldShortCutFactory extends AbstractShortCutFactory {
         AddItemMenuDef(NameableCreator[] creators) {
             this.setName(com.fr.design.i18n.Toolkit.i18nText(("Fine-Design_Basic_Action_Add")));
             this.setMnemonic('A');
-            this.setIconPath("addPopup");
+            this.setIcon(new LazyIcon("add_popup"));
             wrapActionListener(creators);
         }
 

designer-base/src/main/java/com/fr/design/gui/controlpane/shortcutfactory/ShortCutFactory.java

@@ -1,5 +1,6 @@
 package com.fr.design.gui.controlpane.shortcutfactory;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
@@ -66,7 +67,7 @@ public class ShortCutFactory extends AbstractShortCutFactory {
             this.creator = creators[0];
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
             this.setMnemonic('A');
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
+            this.setSmallIcon(new LazyIcon("add"));
         }
 
         /**
@@ -120,7 +121,7 @@ public class ShortCutFactory extends AbstractShortCutFactory {
             super(true);
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add"));
             this.setMnemonic('A');
-            this.setIconPath("/com/fr/design/images/control/addPopup.png");
+            this.setIcon(new LazyIcon("add_popup"));
             wrapActionListener(creators);
         }
 

designer-base/src/main/java/com/fr/design/gui/icontainer/UIScrollPane.java

@@ -14,7 +14,7 @@ import java.awt.Component;
 public class UIScrollPane extends JScrollPane {
 
     private static final long serialVersionUID = 1L;
-    private static final int INCREAMENT = 30;
+    private static final int INCREMENT = 30;
 
     public UIScrollPane(Component c) {
         this(c, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);
@@ -23,32 +23,24 @@ public class UIScrollPane extends JScrollPane {
     public UIScrollPane(Component c, int vertical, int horizontal) {
         super(c, vertical, horizontal);
         this.setHorizontalScrollBar(createHorizontalScrollBar());
-        this.getVerticalScrollBar().setUnitIncrement(INCREAMENT);
+        this.getVerticalScrollBar().setUnitIncrement(INCREMENT);
-        this.getVerticalScrollBar().setBlockIncrement(INCREAMENT);
+        this.getVerticalScrollBar().setBlockIncrement(INCREMENT);
-//        this.getHorizontalScrollBar().setOpaque(true);
-//        this.getHorizontalScrollBar().setBackground(Color.WHITE);
-//        this.getVerticalScrollBar().setOpaque(true);
-//        this.getVerticalScrollBar().setBackground(Color.WHITE);
     }
 
-    @Override
     /**
      * 生成水平滚动条
      */
+    @Override
     public UIScrollBar createHorizontalScrollBar() {
-        UIScrollBar sbr = new UIScrollBar(JScrollBar.HORIZONTAL);
+        return new UIScrollBar(JScrollBar.HORIZONTAL);
-//        sbr.setBackground(UIConstants.NORMAL_BACKGROUND);
-        return sbr;
     }
 
-    @Override
     /**
      * 生成垂直滚动条
      */
+    @Override
     public UIScrollBar createVerticalScrollBar() {
-        UIScrollBar sbr = new UIScrollBar(JScrollBar.VERTICAL);
+        return new UIScrollBar(JScrollBar.VERTICAL);
-//        sbr.setBackground(UIConstants.NORMAL_BACKGROUND);
-        return sbr;
     }
 
 }

designer-base/src/main/java/com/fr/design/menu/MenuDef.java

@@ -118,10 +118,12 @@ public class MenuDef extends ShortCut {
         this.isHeadMenu = headMenu;
     }
 
+    @Deprecated
     public String getIconPath() {
         return iconPath;
     }
 
+    @Deprecated
     public void setIconPath(String iconPath) {
         setDisabledIcon(iconPath, false);
     }
@@ -206,9 +208,6 @@ public class MenuDef extends ShortCut {
                 createdButton = new UIButton(icon);
             } else if (iconPath != null) {
                 createdButton = new UIButton(IconUtils.readIcon(iconPath));
-                if(needDisabled) {
-                    createdButton.setDisabledIcon(IconUtils.readIcon(iconPath + IconUtils.ICON_TYPE_DISABLED));
-                }
                 createdButton.set4ToolbarButton();
             } else {
                 createdButton = new UIButton(name);

designer-base/src/main/resources/com/fine/theme/icon/param/param.svg

@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28 4H4V28H28V4ZM4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 8C11.8954 8 11 8.89543 11 10V23V24C11 24.5523 11.4477 25 12 25C12.5523 25 13 24.5523 13 24V23V10V8Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 19H17.2403C20.2779 19 22.7403 16.5376 22.7403 13.5C22.7403 10.4624 20.2779 8 17.2403 8H13V10H17.2403C19.1733 10 20.7403 11.567 20.7403 13.5C20.7403 15.433 19.1733 17 17.2403 17H13V19Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/param/param_disable.svg

@@ -0,0 +1,5 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M28 4H4V28H28V4ZM4 2C2.89543 2 2 2.89543 2 4V28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 8C11.8954 8 11 8.89543 11 10V23V24C11 24.5523 11.4477 25 12 25C12.5523 25 13 24.5523 13 24V23V10V8Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M13 19H17.2403C20.2779 19 22.7403 16.5376 22.7403 13.5C22.7403 10.4624 20.2779 8 17.2403 8H13V10H17.2403C19.1733 10 20.7403 11.567 20.7403 13.5C20.7403 15.433 19.1733 17 17.2403 17H13V19Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.4 13.1L11.4 18.4C11.4 18.7314 11.6686 19 12 19C12.3314 19 12.6 18.7314 12.6 18.4V13.1H17.9C18.2314 13.1 18.5 12.8314 18.5 12.5C18.5 12.1686 18.2314 11.9 17.9 11.9H12.6V6.6C12.6 6.26863 12.3314 6 12 6C11.6686 6 11.4 6.26863 11.4 6.6L11.4 11.9H6.1C5.76863 11.9 5.5 12.1686 5.5 12.5C5.5 12.8314 5.76863 13.1 6.1 13.1H11.4Z" fill="#0A1C38" fill-opacity="0.9"/>
+<path d="M18.1425 21.5C18.0158 21.5 17.9523 21.3468 18.042 21.2571L20.7571 18.542C20.8468 18.4523 21 18.5158 21 18.6425V21.1C21 21.3209 20.8209 21.5 20.6 21.5H18.1425Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/add_popup_disable.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="25" viewBox="0 0 24 25" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M11.4 13.1L11.4 18.4C11.4 18.7314 11.6686 19 12 19C12.3314 19 12.6 18.7314 12.6 18.4V13.1H17.9C18.2314 13.1 18.5 12.8314 18.5 12.5C18.5 12.1686 18.2314 11.9 17.9 11.9H12.6V6.6C12.6 6.26863 12.3314 6 12 6C11.6686 6 11.4 6.26863 11.4 6.6L11.4 11.9H6.1C5.76863 11.9 5.5 12.1686 5.5 12.5C5.5 12.8314 5.76863 13.1 6.1 13.1H11.4Z" fill="#0A1C38" fill-opacity="0.29"/>
+<path d="M18.1425 21.5C18.0158 21.5 17.9523 21.3468 18.042 21.2571L20.7571 18.542C20.8468 18.4523 21 18.5158 21 18.6425V21.1C21 21.3209 20.8209 21.5 20.6 21.5H18.1425Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/config.svg

@@ -0,0 +1,5 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon &#232;&#174;&#190;&#231;&#189;&#174;-&#231;&#186;&#191;&#230;&#128;&#167;">
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M22.2747 7.16507C22.7907 7.18285 23.2968 7.14403 23.7866 7.05397C24.3007 7.77692 24.7365 8.55872 25.0817 9.38697C24.003 10.6175 23.3465 12.2322 23.3465 14C23.3465 15.7678 24.003 17.3825 25.0817 18.613C24.7081 19.5094 24.2285 20.3513 23.6582 21.1231C23.2325 21.0422 22.7939 21 22.3465 21C19.2175 21 16.5692 23.052 15.6722 25.8846C15.1264 25.9606 14.5682 26 13.9998 26C13.6782 26 13.3598 25.9874 13.0451 25.9627C12.1725 23.0899 9.50398 21 6.34649 21C5.68889 21 5.05095 21.0912 4.44552 21.2617C3.93683 20.5937 3.49692 19.8711 3.13604 19.1046C4.49492 17.829 5.34655 16.0148 5.34655 14C5.34655 11.9852 4.49492 10.171 3.13604 8.8954C3.49692 8.12892 3.93683 7.40634 4.44552 6.73825C5.05097 6.90883 5.68893 7 6.34653 7C9.50403 7 12.1725 4.91009 13.0452 2.03732C13.3598 2.01261 13.6782 2 13.9998 2C14.6109 2 15.2104 2.04552 15.7953 2.13314C16.6195 4.955 19.1765 7.05833 22.2747 7.16507ZM24.5128 4.75433C25.8219 6.2417 26.8203 8.00912 27.4067 9.95516C26.1581 10.8642 25.3465 12.3373 25.3465 14C25.3465 15.6627 26.1581 17.1358 27.4067 18.0448C26.7972 20.0676 25.7425 21.8975 24.3564 23.4204C23.7414 23.1501 23.0615 23 22.3465 23C19.722 23 17.5697 25.0222 17.3628 27.5935C16.2855 27.8591 15.1591 28 13.9998 28C13.0905 28 12.2013 27.9133 11.3402 27.7477C11.2088 25.1035 9.0233 23 6.34649 23C5.44335 23 4.59615 23.2395 3.86489 23.6583C2.45506 22.1794 1.36565 20.3922 0.708008 18.4083C2.27858 17.5652 3.34655 15.9073 3.34655 14C3.34655 12.0927 2.27858 10.4348 0.708008 9.59169C1.36565 7.60775 2.45507 5.82062 3.8649 4.34166C4.59617 4.76055 5.44338 5 6.34653 5C9.02335 5 11.2089 2.8965 11.3403 0.252297C12.2013 0.0867044 13.0905 0 13.9998 0C15.2168 0 16.3974 0.155267 17.5231 0.447069C17.6625 3.00416 19.7352 5.07639 22.3435 5.16626C23.1142 5.19281 23.8502 5.04348 24.5128 4.75433ZM16.9998 14C16.9998 15.6569 15.6567 17 13.9998 17C12.343 17 10.9998 15.6569 10.9998 14C10.9998 12.3431 12.343 11 13.9998 11C15.6567 11 16.9998 12.3431 16.9998 14ZM18.9998 14C18.9998 16.7614 16.7613 19 13.9998 19C11.2384 19 8.99985 16.7614 8.99985 14C8.99985 11.2386 11.2384 9 13.9998 9C16.7613 9 18.9998 11.2386 18.9998 14Z" fill="#0A1C38" fill-opacity="0.9"/>
+</g>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/config_disable.svg

@@ -0,0 +1,5 @@
+<svg width="28" height="28" viewBox="0 0 28 28" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g id="icon &#232;&#174;&#190;&#231;&#189;&#174;-&#231;&#186;&#191;&#230;&#128;&#167;">
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M22.2747 7.16507C22.7907 7.18285 23.2968 7.14403 23.7866 7.05397C24.3007 7.77692 24.7365 8.55872 25.0817 9.38697C24.003 10.6175 23.3465 12.2322 23.3465 14C23.3465 15.7678 24.003 17.3825 25.0817 18.613C24.7081 19.5094 24.2285 20.3513 23.6582 21.1231C23.2325 21.0422 22.7939 21 22.3465 21C19.2175 21 16.5692 23.052 15.6722 25.8846C15.1264 25.9606 14.5682 26 13.9998 26C13.6782 26 13.3598 25.9874 13.0451 25.9627C12.1725 23.0899 9.50398 21 6.34649 21C5.68889 21 5.05095 21.0912 4.44552 21.2617C3.93683 20.5937 3.49692 19.8711 3.13604 19.1046C4.49492 17.829 5.34655 16.0148 5.34655 14C5.34655 11.9852 4.49492 10.171 3.13604 8.8954C3.49692 8.12892 3.93683 7.40634 4.44552 6.73825C5.05097 6.90883 5.68893 7 6.34653 7C9.50403 7 12.1725 4.91009 13.0452 2.03732C13.3598 2.01261 13.6782 2 13.9998 2C14.6109 2 15.2104 2.04552 15.7953 2.13314C16.6195 4.955 19.1765 7.05833 22.2747 7.16507ZM24.5128 4.75433C25.8219 6.2417 26.8203 8.00912 27.4067 9.95516C26.1581 10.8642 25.3465 12.3373 25.3465 14C25.3465 15.6627 26.1581 17.1358 27.4067 18.0448C26.7972 20.0676 25.7425 21.8975 24.3564 23.4204C23.7414 23.1501 23.0615 23 22.3465 23C19.722 23 17.5697 25.0222 17.3628 27.5935C16.2855 27.8591 15.1591 28 13.9998 28C13.0905 28 12.2013 27.9133 11.3402 27.7477C11.2088 25.1035 9.0233 23 6.34649 23C5.44335 23 4.59615 23.2395 3.86489 23.6583C2.45506 22.1794 1.36565 20.3922 0.708008 18.4083C2.27858 17.5652 3.34655 15.9073 3.34655 14C3.34655 12.0927 2.27858 10.4348 0.708008 9.59169C1.36565 7.60775 2.45507 5.82062 3.8649 4.34166C4.59617 4.76055 5.44338 5 6.34653 5C9.02335 5 11.2089 2.8965 11.3403 0.252297C12.2013 0.0867044 13.0905 0 13.9998 0C15.2168 0 16.3974 0.155267 17.5231 0.447069C17.6625 3.00416 19.7352 5.07639 22.3435 5.16626C23.1142 5.19281 23.8502 5.04348 24.5128 4.75433ZM16.9998 14C16.9998 15.6569 15.6567 17 13.9998 17C12.343 17 10.9998 15.6569 10.9998 14C10.9998 12.3431 12.343 11 13.9998 11C15.6567 11 16.9998 12.3431 16.9998 14ZM18.9998 14C18.9998 16.7614 16.7613 19 13.9998 19C11.2384 19 8.99985 16.7614 8.99985 14C8.99985 11.2386 11.2384 9 13.9998 9C16.7613 9 18.9998 11.2386 18.9998 14Z" fill="#0A1C38" fill-opacity="0.29"/>
+</g>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left.svg

@@ -0,0 +1,3 @@
+<svg width="26" height="18" viewBox="0 0 26 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M4.12136 10.207L10.2072 16.2928C10.5977 16.6834 10.5977 17.3165 10.2072 17.707C9.81667 18.0976 9.18351 18.0976 8.79298 17.707L0.292968 9.20703L8.79298 0.707016C9.18351 0.31649 9.81667 0.316492 10.2072 0.707016C10.5977 1.09754 10.5977 1.7307 10.2072 2.12123L4.12143 8.207L24.7071 8.207C25.2594 8.207 25.7071 8.65471 25.7071 9.207C25.7071 9.75928 25.2594 10.207 24.7071 10.207L4.12136 10.207Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_left_disable.svg

@@ -0,0 +1,3 @@
+<svg width="26" height="18" viewBox="0 0 26 18" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path id="Union" fill-rule="evenodd" clip-rule="evenodd" d="M4.12136 10.207L10.2072 16.2928C10.5977 16.6834 10.5977 17.3165 10.2072 17.707C9.81667 18.0976 9.18351 18.0976 8.79298 17.707L0.292968 9.20703L8.79298 0.707016C9.18351 0.31649 9.81667 0.316492 10.2072 0.707016C10.5977 1.09754 10.5977 1.7307 10.2072 2.12123L4.12143 8.207L24.7071 8.207C25.2594 8.207 25.7071 8.65471 25.7071 9.207C25.7071 9.75928 25.2594 10.207 24.7071 10.207L4.12136 10.207Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.8786 17.2071L18.7928 23.2929C18.4023 23.6834 18.4023 24.3166 18.7928 24.7071C19.1833 25.0976 19.8165 25.0976 20.207 24.7071L28.707 16.2071L20.207 7.70708C19.8165 7.31655 19.1833 7.31655 18.7928 7.70708C18.4023 8.0976 18.4023 8.73077 18.7928 9.12129L24.8786 15.2071L4.29288 15.2071C3.74059 15.2071 3.29288 15.6548 3.29288 16.2071C3.29288 16.7593 3.74059 17.2071 4.29288 17.2071L24.8786 17.2071Z" fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/toolbar/move_right_disable.svg

@@ -0,0 +1,3 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M24.8786 17.2071L18.7928 23.2929C18.4023 23.6834 18.4023 24.3166 18.7928 24.7071C19.1833 25.0976 19.8165 25.0976 20.207 24.7071L28.707 16.2071L20.207 7.70708C19.8165 7.31655 19.1833 7.31655 18.7928 7.70708C18.4023 8.0976 18.4023 8.73077 18.7928 9.12129L24.8786 15.2071L4.29288 15.2071C3.74059 15.2071 3.29288 15.6548 3.29288 16.2071C3.29288 16.7593 3.74059 17.2071 4.29288 17.2071L24.8786 17.2071Z" fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties

@@ -420,7 +420,7 @@ HelpButton.innerFocusWidth = $?Button.innerFocusWidth
 
 #---- List ----
 
-List.border = 0,0,0,0
+List.border = 2,2,2,2
 List.cellMargins = 1,6,1,6
 List.selectionInsets = 0,0,0,0
 List.selectionArc = 0
@@ -1020,7 +1020,7 @@ ToggleButton.rollover = $Button.rollover
 ToggleButton.background = $Button.background
 ToggleButton.pressedBackground = @BrandPressedColor
 ToggleButton.selectedBackground = @BrandColor
-ToggleButton.selectedForeground = $ToggleButton.foreground
+ToggleButton.selectedForeground = #FFF
 ToggleButton.disabledSelectedBackground = darken($ToggleButton.background,13%,derived)
 
 ToggleButton.toolbar.hoverBackground = $Button.toolbar.hoverBackground

designer-realize/src/main/java/com/fr/design/webattr/EventPane.java

@@ -1,6 +1,6 @@
 package com.fr.design.webattr;
 
-import com.fr.base.BaseUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.dialog.FineJOptionPane;
 import com.fr.design.gui.icontainer.UIScrollPane;
@@ -163,7 +163,7 @@ public class EventPane extends BasicPane {
 	public class RemoveAction extends UpdateAction {
 		public RemoveAction() {
 			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"));
-			this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png"));
+			this.setSmallIcon(new LazyIcon("remove"));
 		}
 
 		public void actionPerformed(ActionEvent e) {
@@ -187,7 +187,7 @@ public class EventPane extends BasicPane {
 	public class EditAction extends UpdateAction {
 		public EditAction() {
 			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
-			this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png"));
+			this.setSmallIcon(new LazyIcon("edit"));
 		}
 
 		public void actionPerformed(ActionEvent e) {
@@ -227,7 +227,7 @@ public class EventPane extends BasicPane {
 			this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
 			this.setTooltip(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Add"));
 			this.setMnemonic('A');
-			this.setIconPath("/com/fr/design/images/control/addPopup.png");
+			this.setIcon(new LazyIcon("add_popup"));
 			this.menuName = menuName;
 			showMenu();
 		}