REPORT-107973 设计器样式翻新

【问题原因】rt
【改动思路】替换菜单栏icon

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

@@ -69,7 +69,31 @@ public class FineLightIconSet extends AbstractIconSet {
                 new SvgIconSource("checkbox_checked", "com/fine/theme/icon/checkbox/checked.svg", true),
                 new SvgIconSource("checkbox_unchecked", "com/fine/theme/icon/checkbox/unchecked.svg", true),
                 new SvgIconSource("checkbox_part_checked", "com/fine/theme/icon/checkbox/part_checked.svg", true),
-                new SvgIconSource("checkbox_hovered", "com/fine/theme/icon/checkbox/hovered.svg", true)
+                new SvgIconSource("checkbox_hovered", "com/fine/theme/icon/checkbox/hovered.svg", true),
+
+                // 菜单栏Icon
+                new SvgIconSource("bold", "com/fine/theme/icon/font/bold.svg"),
+                new SvgIconSource("italic", "com/fine/theme/icon/font/italic.svg"),
+                new SvgIconSource("underline", "com/fine/theme/icon/font/underline.svg"),
+                new SvgIconSource("foreground", "com/fine/theme/icon/font/foreground.svg"),
+                new SvgIconSource("background", "com/fine/theme/icon/font/background.svg"),
+                new SvgIconSource("h_left", "com/fine/theme/icon/cellstyle/h_left.svg"),
+                new SvgIconSource("h_center", "com/fine/theme/icon/cellstyle/h_center.svg"),
+                new SvgIconSource("h_right", "com/fine/theme/icon/cellstyle/h_right.svg"),
+                new SvgIconSource("noboder", "com/fine/theme/icon/noboder.svg", true),
+                new SvgIconSource("merge", "com/fine/theme/icon/merge/merge.svg", true),
+                new SvgIconSource("unmerge", "com/fine/theme/icon/merge/unmerge.svg", true),
+                new SvgIconSource("bind_column", "com/fine/theme/icon/bindcolumn/bind_column.svg", true),
+                new SvgIconSource("text", "com/fine/theme/icon/insert/text.svg", true),
+                new SvgIconSource("richtext", "com/fine/theme/icon/insert/richtext.svg", true),
+                new SvgIconSource("formula", "com/fine/theme/icon/insert/formula.svg", true),
+                new SvgIconSource("chart", "com/fine/theme/icon/insert/chart.svg", true),
+                new SvgIconSource("image", "com/fine/theme/icon/insert/image.svg", true),
+                new SvgIconSource("bias", "com/fine/theme/icon/insert/bias.svg", true),
+                new SvgIconSource("sub_report", "com/fine/theme/icon/insert/sub_report.svg", true),
+                new SvgIconSource("chart_line", "com/fine/theme/icon/chart/chart_line.svg", true),
+                new SvgIconSource("popup", "com/fine/theme/icon/popup/popup.svg", true),
+                new SvgIconSource("clear", "com/fine/theme/icon/clear.svg", true)
 
         );
     }

designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java

@@ -1,7 +1,6 @@
 package com.fr.design.data.datapane.management.search.pane;
 
 import com.fine.theme.icon.LazyIcon;
-import com.fr.base.svg.IconUtils;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.datapane.TableDataTreePane;
@@ -150,7 +149,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha
         });
         this.searchTextField.addKeyListener(enterPressed);
         // 右侧返回图标
-        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear"));
+        UILabel returnLabel = new UILabel(new LazyIcon("clear"));
         returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return"));
         returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11));
         returnLabel.addMouseListener(new MouseAdapter() {

designer-base/src/main/java/com/fr/design/icon/BorderIcon.java

@@ -1,18 +1,16 @@
 package com.fr.design.icon;
 
+import com.fr.base.CellBorderStyle;
+import com.fr.base.GraphHelper;
 import com.fr.stable.AssistUtils;
+import com.fr.stable.Constants;
+
+import javax.swing.Icon;
 import java.awt.Color;
 import java.awt.Component;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 
-import javax.swing.Icon;
-
-import com.fr.base.CellBorderStyle;
-import com.fr.base.GraphHelper;
-import com.fr.design.constants.UIConstants;
-import com.fr.stable.Constants;
-
 public class BorderIcon implements Icon {
 
 	private int width = 14;
@@ -57,7 +55,8 @@ public class BorderIcon implements Icon {
             || lineStyle == Constants.LINE_DOUBLE) {
             GraphHelper.drawLine(g, x1, y1, x2, y2, lineStyle);
         } else {
-            lineStyle = Constants.LINE_DOT;
+            lineStyle = Constants.LINE_THIN;
+            g.setColor(new Color(185, 189, 196));
             if (AssistUtils.equals(y1, x2) && AssistUtils.equals(x2, y2)) {
                 GraphHelper.drawLine(g, x1, y1, x2 + 1, y2, lineStyle);
             } else {
@@ -75,8 +74,6 @@ public class BorderIcon implements Icon {
         int y1 = (defaultHeight - height) / 2;
         int y2 = (defaultHeight + height) / 2;
         Graphics2D gr = (Graphics2D) g;
-        gr.setColor(UIConstants.NORMAL_BACKGROUND);
-        gr.fillRect(x1, y1, width, height);
         drawLine(gr, x1, y1, x2, y1, cellBorderStyle.getTopStyle(),
             cellBorderStyle.getTopColor());
         drawLine(gr, x2, y1, x2, y2, cellBorderStyle.getRightStyle(),

designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java

@@ -4,7 +4,7 @@
 package com.fr.design.style.color;
 
 
-import com.fr.base.svg.IconUtils;
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
@@ -35,7 +35,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     private UIObserverListener uiObserverListener;
 
     public UIToolbarColorButton(Icon icon) {
-        super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup")));
+        super(new UIColorButton(icon), new UIButton(new LazyIcon("popup")));
         getLeftButton().setEventBanned(true);
         getRightButton().addFocusListener(new FocusListener() {
 

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

@@ -0,0 +1,16 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M7 8.25C7 7.69772 7.44772 7.25 8 7.25C8.55228 7.25 9 7.69772 9 8.25C9 8.80228 8.55228 9.25 8 9.25C7.44772 9.25 7 8.80228 7 8.25Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M11 8.25C11 7.69772 11.4477 7.25 12 7.25H18C18.5523 7.25 19 7.69772 19 8.25C19 8.80228 18.5523 9.25 18 9.25H12C11.4477 9.25 11 8.80228 11 8.25Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M2 3.65C2 2.8768 2.6268 2.25 3.4 2.25H28.6C29.3732 2.25 30 2.8768 30 3.65V12.85C30 13.6232 29.3732 14.25 28.6 14.25H3.4C2.6268 14.25 2 13.6232 2 12.85V3.65ZM28 12.25H4V4.25H28V12.25Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M8 22.75C7.44772 22.75 7 23.1977 7 23.75C7 24.3023 7.44772 24.75 8 24.75C8.55228 24.75 9 24.3023 9 23.75C9 23.1977 8.55228 22.75 8 22.75Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M12 22.75C11.4477 22.75 11 23.1977 11 23.75C11 24.3023 11.4477 24.75 12 24.75H18C18.5523 24.75 19 24.3023 19 23.75C19 23.1977 18.5523 22.75 18 22.75H12Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M2 19.15C2 18.3768 2.6268 17.75 3.4 17.75H28.6C29.3732 17.75 30 18.3768 30 19.15V28.35C30 29.1232 29.3732 29.75 28.6 29.75H3.4C2.6268 29.75 2 29.1232 2 28.35V19.15ZM4 19.75H28V27.75H4V19.75Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,16 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M7 8.25C7 7.69772 7.44772 7.25 8 7.25C8.55228 7.25 9 7.69772 9 8.25C9 8.80228 8.55228 9.25 8 9.25C7.44772 9.25 7 8.80228 7 8.25Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M11 8.25C11 7.69772 11.4477 7.25 12 7.25H18C18.5523 7.25 19 7.69772 19 8.25C19 8.80228 18.5523 9.25 18 9.25H12C11.4477 9.25 11 8.80228 11 8.25Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M2 3.65C2 2.8768 2.6268 2.25 3.4 2.25H28.6C29.3732 2.25 30 2.8768 30 3.65V12.85C30 13.6232 29.3732 14.25 28.6 14.25H3.4C2.6268 14.25 2 13.6232 2 12.85V3.65ZM28 12.25H4V4.25H28V12.25Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M8 22.75C7.44772 22.75 7 23.1977 7 23.75C7 24.3023 7.44772 24.75 8 24.75C8.55228 24.75 9 24.3023 9 23.75C9 23.1977 8.55228 22.75 8 22.75Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M12 22.75C11.4477 22.75 11 23.1977 11 23.75C11 24.3023 11.4477 24.75 12 24.75H18C18.5523 24.75 19 24.3023 19 23.75C19 23.1977 18.5523 22.75 18 22.75H12Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M2 19.15C2 18.3768 2.6268 17.75 3.4 17.75H28.6C29.3732 17.75 30 18.3768 30 19.15V28.35C30 29.1232 29.3732 29.75 28.6 29.75H3.4C2.6268 29.75 2 29.1232 2 28.35V19.15ZM4 19.75H28V27.75H4V19.75Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

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

@@ -0,0 +1,10 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M5.1 4.5C4.49249 4.5 4 4.99249 4 5.6C4 6.20751 4.49249 6.7 5.1 6.7H26.9C27.5075 6.7 28 6.20751 28 5.6C28 4.99249 27.5075 4.5 26.9 4.5H5.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M9.1 11.4333C8.49249 11.4333 8 11.9258 8 12.5333C8 13.1408 8.49249 13.6333 9.1 13.6333H22.9C23.5075 13.6333 24 13.1408 24 12.5333C24 11.9258 23.5075 11.4333 22.9 11.4333H9.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M4 19.4667C4 18.8592 4.49249 18.3667 5.1 18.3667H26.9C27.5075 18.3667 28 18.8592 28 19.4667C28 20.0742 27.5075 20.5667 26.9 20.5667H5.1C4.49249 20.5667 4 20.0742 4 19.4667Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M9.1 25.2999C8.49249 25.2999 8 25.7924 8 26.4C8 27.0075 8.49249 27.5 9.1 27.5H22.9C23.5075 27.5 24 27.0075 24 26.4C24 25.7924 23.5075 25.2999 22.9 25.2999H9.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,10 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M5.1 4.5C4.49249 4.5 4 4.99249 4 5.6C4 6.20751 4.49249 6.7 5.1 6.7H26.9C27.5075 6.7 28 6.20751 28 5.6C28 4.99249 27.5075 4.5 26.9 4.5H5.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M5.1 11.4333C4.49249 11.4333 4 11.9258 4 12.5333C4 13.1408 4.49249 13.6333 5.1 13.6333H18.9C19.5075 13.6333 20 13.1408 20 12.5333C20 11.9258 19.5075 11.4333 18.9 11.4333H5.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M4 19.4667C4 18.8592 4.49249 18.3667 5.1 18.3667H26.9C27.5075 18.3667 28 18.8592 28 19.4667C28 20.0742 27.5075 20.5667 26.9 20.5667H5.1C4.49249 20.5667 4 20.0742 4 19.4667Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M5.1 25.3C4.49249 25.3 4 25.7925 4 26.4C4 27.0075 4.49249 27.5 5.1 27.5H18.9C19.5075 27.5 20 27.0075 20 26.4C20 25.7925 19.5075 25.3 18.9 25.3H5.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,10 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M5.1 4.5C4.49249 4.5 4 4.99249 4 5.6C4 6.20751 4.49249 6.7 5.1 6.7H26.9C27.5075 6.7 28 6.20751 28 5.6C28 4.99249 27.5075 4.5 26.9 4.5H5.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M13.1 11.4333C12.4925 11.4333 12 11.9258 12 12.5333C12 13.1408 12.4925 13.6333 13.1 13.6333H26.9C27.5075 13.6333 28 13.1408 28 12.5333C28 11.9258 27.5075 11.4333 26.9 11.4333H13.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M4 19.4667C4 18.8592 4.49249 18.3667 5.1 18.3667H26.9C27.5075 18.3667 28 18.8592 28 19.4667C28 20.0742 27.5075 20.5667 26.9 20.5667H5.1C4.49249 20.5667 4 20.0742 4 19.4667Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M13.1 25.3C12.4925 25.3 12 25.7925 12 26.4C12 27.0075 12.4925 27.5 13.1 27.5H26.9C27.5075 27.5 28 27.0075 28 26.4C28 25.7925 27.5075 25.3 26.9 25.3H13.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,11 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <g clip-path="url(#clip0_5109_80552)">
+        <path d="M14.5858 16L7.51472 23.071C7.12419 23.4616 7.12419 24.0947 7.51472 24.4853C7.90524 24.8758 8.53841 24.8758 8.92893 24.4853L16 17.4142L23.0711 24.4853C23.4616 24.8758 24.0948 24.8758 24.4853 24.4853C24.8758 24.0947 24.8758 23.4616 24.4853 23.071L17.4142 16L24.4853 8.92891C24.8758 8.53839 24.8758 7.90522 24.4853 7.5147C24.0948 7.12418 23.4616 7.12418 23.0711 7.5147L16 14.5858L8.92893 7.5147C8.53841 7.12418 7.90524 7.12418 7.51472 7.5147C7.12419 7.90522 7.12419 8.53839 7.51472 8.92891L14.5858 16Z"
+              fill="#0A1C38" fill-opacity="0.9"/>
+    </g>
+    <defs>
+        <clipPath id="clip0_5109_80552">
+            <rect width="32" height="32" fill="white"/>
+        </clipPath>
+    </defs>
+</svg>

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

@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <rect x="3" y="27" width="26" height="3" rx="1.5" fill="#2576EF"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M13.9011 3.42119L12.8134 2.33351C12.3838 1.90393 12.3838 1.20745 12.8134 0.777871C13.243 0.348295 13.9394 0.348294 14.369 0.777871L27.404 13.8129C27.7617 14.1706 27.7439 14.7558 27.3651 15.0911L15.6913 25.4233C15.137 25.9138 14.2968 25.8882 13.7734 25.3648L3.85536 15.4468C3.30863 14.9 3.30863 14.0136 3.85536 13.4669L13.9011 3.42119ZM15.4567 4.97682L5.97668 14.4568L8.51991 17.0001H21.8767L24.842 14.3622L15.4567 4.97682ZM26.5004 19.0001L24.7324 20.7575C24.3827 21.105 24.1445 21.5478 24.048 22.0299C23.9515 22.512 24.0009 23.0117 24.1901 23.4658C24.3793 23.9199 24.6997 24.3081 25.1109 24.5812C25.522 24.8543 26.0054 25.0001 26.4999 25.0001C26.9944 25.0001 27.4778 24.8543 27.8889 24.5812C28.3 24.3081 28.6205 23.9199 28.8097 23.4658C28.9989 23.0117 29.0483 22.512 28.9518 22.0299C28.8553 21.5478 28.6171 21.105 28.2674 20.7575L26.5004 19.0001Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/font/bold.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="M8.7 14.8828V6.2H15.9561C18.3552 6.2 20.3 8.14483 20.3 10.5439C20.3 12.872 18.4685 14.7724 16.1677 14.8828H8.7ZM6.5 14.8828V5.03226C6.5 4.46216 6.96216 4 7.53226 4H15.9561C19.5702 4 22.5 6.92981 22.5 10.5439C22.5 12.3184 21.7937 13.9279 20.6469 15.1067C23.4422 15.8574 25.5 18.4091 25.5 21.4414C25.5 25.0636 22.5636 28 18.9414 28H7.61765C7.00039 28 6.5 27.4996 6.5 26.8823V17.0878V14.8828ZM8.7 17.0878V25.8H18.9414C21.3486 25.8 23.3 23.8486 23.3 21.4414C23.3 19.0342 21.3486 17.0828 18.9414 17.0828H16.2159C16.1297 17.0861 16.0431 17.0878 15.9561 17.0878H8.7Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/font/foreground.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 d="M5.7018 24.8844C5.84704 24.9522 6.00435 24.991 6.16474 24.9986C6.32512 25.0062 6.48545 24.9824 6.63654 24.9286C6.78764 24.8748 6.92655 24.792 7.04533 24.685C7.16411 24.578 7.26044 24.4488 7.32881 24.3049L9.87397 18.9472H22.1262L24.6713 24.3049C24.7397 24.4488 24.8361 24.5779 24.9549 24.6849C25.0737 24.7918 25.2126 24.8746 25.3637 24.9284C25.5147 24.9822 25.675 25.006 25.8354 24.9985C25.9958 24.9909 26.1531 24.9522 26.2983 24.8844C26.4436 24.8167 26.5739 24.7213 26.682 24.6036C26.79 24.486 26.8735 24.3484 26.9279 24.1988C26.9822 24.0491 27.0062 23.8904 26.9986 23.7315C26.991 23.5727 26.9519 23.4169 26.8835 23.273L17.1061 2.69551C17.0074 2.48756 16.851 2.31173 16.6551 2.18856C16.4593 2.0654 16.2321 2 16.0001 2C15.7681 2 15.5409 2.0654 15.345 2.18856C15.1491 2.31173 14.9927 2.48756 14.894 2.69551L5.11669 23.273C5.04822 23.4169 5.00904 23.5727 5.00139 23.7315C4.99374 23.8904 5.01777 24.0492 5.07211 24.1988C5.12645 24.3485 5.21003 24.486 5.31807 24.6037C5.42612 24.7213 5.55651 24.8167 5.7018 24.8844ZM16.0001 6.05448L20.9758 16.5263H11.0243L16.0001 6.05448Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <rect x="4" y="27" width="24" height="3" rx="1.5" fill="#2576EF"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/font/italic.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="M13 6.1C13 5.49249 13.4925 5 14.1 5H24.9C25.5075 5 26 5.49249 26 6.1C26 6.70751 25.5075 7.2 24.9 7.2H20.7248L14.1248 24.8001H17.9C18.5075 24.8001 19 25.2925 19 25.9001C19 26.5076 18.5075 27.0001 17.9 27.0001H7.1C6.49249 27.0001 6 26.5076 6 25.9001C6 25.2925 6.49249 24.8001 7.1 24.8001H11.7752L18.3752 7.2H14.1C13.4925 7.2 13 6.70751 13 6.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/font/underline.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="M9.5 4C9.5 3.44772 9.05228 3 8.5 3C7.94772 3 7.5 3.44772 7.5 4V15.5C7.5 20.1944 11.3056 24 16 24C20.6944 24 24.5 20.1944 24.5 15.5V4C24.5 3.44772 24.0523 3 23.5 3C22.9477 3 22.5 3.44772 22.5 4V15.5C22.5 19.0899 19.5899 22 16 22C12.4101 22 9.5 19.0899 9.5 15.5V4ZM6.1 26C5.49249 26 5 26.4925 5 27.1C5 27.7075 5.49249 28.2 6.1 28.2H25.9C26.5075 28.2 27 27.7075 27 27.1C27 26.4925 26.5075 26 25.9 26H6.1Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/insert/bias.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="M29.3233 17.2813C29.0195 17.8463 28.3151 18.058 27.7502 17.7541L6.9148 6.5477L15.1328 28.4666C15.358 29.0673 15.0536 29.7368 14.4529 29.962C13.8523 30.1872 13.1828 29.8828 12.9576 29.2822L3.75269 4.73095L3.75268 4.73094C3.34192 3.63532 4.5088 2.61586 5.53938 3.17017L28.8506 15.7082C29.4155 16.0121 29.6272 16.7164 29.3233 17.2813Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/insert/bias_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="M29.3233 17.2813C29.0195 17.8463 28.3151 18.058 27.7502 17.7541L6.9148 6.5477L15.1328 28.4666C15.358 29.0673 15.0536 29.7368 14.4529 29.962C13.8523 30.1872 13.1828 29.8828 12.9576 29.2822L3.75269 4.73095L3.75268 4.73094C3.34192 3.63532 4.5088 2.61586 5.53938 3.17017L28.8506 15.7082C29.4155 16.0121 29.6272 16.7164 29.3233 17.2813Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/insert/chart.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="M21.5 11V4C21.5 3.44772 21.0523 3 20.5 3H12C11.4477 3 11 3.44772 11 4V15H3.5C2.94772 15 2.5 15.4477 2.5 16V28C2.5 28.5523 2.94772 29 3.5 29H29C29.5523 29 30 28.5523 30 28V12C30 11.4477 29.5523 11 29 11H21.5ZM13 5V27H19.5V5H13ZM21.5 13V27H28V13H21.5ZM4.5 17H11V27H4.5V17Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/insert/chart_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="M21.5 11V4C21.5 3.44772 21.0523 3 20.5 3H12C11.4477 3 11 3.44772 11 4V15H3.5C2.94772 15 2.5 15.4477 2.5 16V28C2.5 28.5523 2.94772 29 3.5 29H29C29.5523 29 30 28.5523 30 28V12C30 11.4477 29.5523 11 29 11H21.5ZM13 5V27H19.5V5H13ZM21.5 13V27H28V13H21.5ZM4.5 17H11V27H4.5V17Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

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

@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M16.3891 3.04517C13.2858 1.72628 9.77964 3.72832 9.33825 7.07128L8.83273 10.8999H3.9999C3.39239 10.8999 2.8999 11.3924 2.8999 11.9999C2.8999 12.6075 3.39239 13.0999 3.9999 13.0999H8.54225L7.20712 23.2117C6.92843 25.3224 5.12893 26.9 2.9999 26.9C2.39239 26.9 1.8999 27.3924 1.8999 28C1.8999 28.6075 2.39239 29.1 2.9999 29.1C6.23264 29.1 8.96503 26.7046 9.38819 23.4997L10.7613 13.0999H15.4999C16.1074 13.0999 16.5999 12.6075 16.5999 11.9999C16.5999 11.3924 16.1074 10.8999 15.4999 10.8999H11.0518L11.5193 7.35926C11.7703 5.45836 13.764 4.31995 15.5286 5.0699L16.5697 5.51232C17.1288 5.74994 17.7747 5.48931 18.0123 4.9302C18.2499 4.37108 17.9893 3.7252 17.4301 3.48758L16.3891 3.04517Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M16.8999 14.9999C16.8999 14.3924 17.3924 13.8999 17.9999 13.8999C19.6271 13.8999 21.135 14.7537 21.9721 16.149L22.9776 17.8248L24.8443 15.7507C25.9046 14.5726 27.415 13.8999 28.9999 13.8999C29.6074 13.8999 30.0999 14.3924 30.0999 14.9999C30.0999 15.6075 29.6074 16.0999 28.9999 16.0999C28.0387 16.0999 27.1226 16.5079 26.4796 17.2224L24.1615 19.798L25.9142 22.719C26.3537 23.4517 27.1455 23.8999 27.9999 23.8999C28.6074 23.8999 29.0999 24.3924 29.0999 25C29.0999 25.6075 28.6074 26.0999 27.9999 26.0999C26.3727 26.0999 24.8648 25.2462 24.0277 23.8509L22.6222 21.5084L20.1555 24.2492C19.0952 25.4273 17.5848 26.0999 15.9999 26.0999C15.3924 26.0999 14.8999 25.6075 14.8999 25C14.8999 24.3924 15.3924 23.9 15.9999 23.9C16.9611 23.9 17.8772 23.492 18.5202 22.7775L21.4383 19.5352L20.0857 17.2809C19.6461 16.5482 18.8543 16.0999 17.9999 16.0999C17.3924 16.0999 16.8999 15.6075 16.8999 14.9999Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,6 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M16.3891 3.04517C13.2858 1.72628 9.77964 3.72832 9.33825 7.07128L8.83273 10.8999H3.9999C3.39239 10.8999 2.8999 11.3924 2.8999 11.9999C2.8999 12.6075 3.39239 13.0999 3.9999 13.0999H8.54225L7.20712 23.2117C6.92843 25.3224 5.12893 26.9 2.9999 26.9C2.39239 26.9 1.8999 27.3924 1.8999 28C1.8999 28.6075 2.39239 29.1 2.9999 29.1C6.23264 29.1 8.96503 26.7046 9.38819 23.4997L10.7613 13.0999H15.4999C16.1074 13.0999 16.5999 12.6075 16.5999 11.9999C16.5999 11.3924 16.1074 10.8999 15.4999 10.8999H11.0518L11.5193 7.35926C11.7703 5.45836 13.764 4.31995 15.5286 5.0699L16.5697 5.51232C17.1288 5.74994 17.7747 5.48931 18.0123 4.9302C18.2499 4.37108 17.9893 3.7252 17.4301 3.48758L16.3891 3.04517Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M16.8999 14.9999C16.8999 14.3924 17.3924 13.8999 17.9999 13.8999C19.6271 13.8999 21.135 14.7537 21.9721 16.149L22.9776 17.8248L24.8443 15.7507C25.9046 14.5726 27.415 13.8999 28.9999 13.8999C29.6074 13.8999 30.0999 14.3924 30.0999 14.9999C30.0999 15.6075 29.6074 16.0999 28.9999 16.0999C28.0387 16.0999 27.1226 16.5079 26.4796 17.2224L24.1615 19.798L25.9142 22.719C26.3537 23.4517 27.1455 23.8999 27.9999 23.8999C28.6074 23.8999 29.0999 24.3924 29.0999 25C29.0999 25.6075 28.6074 26.0999 27.9999 26.0999C26.3727 26.0999 24.8648 25.2462 24.0277 23.8509L22.6222 21.5084L20.1555 24.2492C19.0952 25.4273 17.5848 26.0999 15.9999 26.0999C15.3924 26.0999 14.8999 25.6075 14.8999 25C14.8999 24.3924 15.3924 23.9 15.9999 23.9C16.9611 23.9 17.8772 23.492 18.5202 22.7775L21.4383 19.5352L20.0857 17.2809C19.6461 16.5482 18.8543 16.0999 17.9999 16.0999C17.3924 16.0999 16.8999 15.6075 16.8999 14.9999Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

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

@@ -0,0 +1,8 @@
+<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="M25 10.5C25 12.433 23.433 14 21.5 14C19.567 14 18 12.433 18 10.5C18 8.567 19.567 7 21.5 7C23.433 7 25 8.567 25 10.5ZM23 10.5C23 11.3284 22.3284 12 21.5 12C20.6716 12 20 11.3284 20 10.5C20 9.67157 20.6716 9 21.5 9C22.3284 9 23 9.67157 23 10.5Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M4 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 2H4ZM28 4H4V18.284L10.1658 12.8436C10.9312 12.1683 12.0823 12.1776 12.8366 12.8653L28 26.6908V4ZM4 28V20.9513L11.4891 14.3433L26.4674 28H4Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,8 @@
+<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="M25 10.5C25 12.433 23.433 14 21.5 14C19.567 14 18 12.433 18 10.5C18 8.567 19.567 7 21.5 7C23.433 7 25 8.567 25 10.5ZM23 10.5C23 11.3284 22.3284 12 21.5 12C20.6716 12 20 11.3284 20 10.5C20 9.67157 20.6716 9 21.5 9C22.3284 9 23 9.67157 23 10.5Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M4 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 2H4ZM28 4H4V18.284L10.1658 12.8436C10.9312 12.1683 12.0823 12.1776 12.8366 12.8653L28 26.6908V4ZM4 28V20.9513L11.4891 14.3433L26.4674 28H4Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

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

@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2 5C2 4.44772 2.44772 4 3 4H13C13.5523 4 14 4.44772 14 5C14 5.55228 13.5523 6 13 6H9V16C9 16.5523 8.55228 17 8 17C7.44771 17 7 16.5523 7 16V6H3C2.44772 6 2 5.55228 2 5Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M18 15C17.4477 15 17 15.4477 17 16C17 16.5523 17.4477 17 18 17H29C29.5523 17 30 16.5523 30 16C30 15.4477 29.5523 15 29 15H18Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M2 27C2 26.4477 2.44772 26 3 26H29C29.5523 26 30 26.4477 30 27C30 27.5523 29.5523 28 29 28H3C2.44772 28 2 27.5523 2 27Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M18 9.5C17.4477 9.5 17 9.94771 17 10.5C17 11.0523 17.4477 11.5 18 11.5H29C29.5523 11.5 30 11.0523 30 10.5C30 9.94771 29.5523 9.5 29 9.5H18Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M17 5C17 4.44772 17.4477 4 18 4H29C29.5523 4 30 4.44772 30 5C30 5.55228 29.5523 6 29 6H18C17.4477 6 17 5.55228 17 5Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M3 20.5C2.44772 20.5 2 20.9477 2 21.5C2 22.0523 2.44772 22.5 3 22.5H29C29.5523 22.5 30 22.0523 30 21.5C30 20.9477 29.5523 20.5 29 20.5H3Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,14 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M2 5C2 4.44772 2.44772 4 3 4H13C13.5523 4 14 4.44772 14 5C14 5.55228 13.5523 6 13 6H9V16C9 16.5523 8.55228 17 8 17C7.44771 17 7 16.5523 7 16V6H3C2.44772 6 2 5.55228 2 5Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M18 15C17.4477 15 17 15.4477 17 16C17 16.5523 17.4477 17 18 17H29C29.5523 17 30 16.5523 30 16C30 15.4477 29.5523 15 29 15H18Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M2 27C2 26.4477 2.44772 26 3 26H29C29.5523 26 30 26.4477 30 27C30 27.5523 29.5523 28 29 28H3C2.44772 28 2 27.5523 2 27Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M18 9.5C17.4477 9.5 17 9.94771 17 10.5C17 11.0523 17.4477 11.5 18 11.5H29C29.5523 11.5 30 11.0523 30 10.5C30 9.94771 29.5523 9.5 29 9.5H18Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M17 5C17 4.44772 17.4477 4 18 4H29C29.5523 4 30 4.44772 30 5C30 5.55228 29.5523 6 29 6H18C17.4477 6 17 5.55228 17 5Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M3 20.5C2.44772 20.5 2 20.9477 2 21.5C2 22.0523 2.44772 22.5 3 22.5H29C29.5523 22.5 30 22.0523 30 21.5C30 20.9477 29.5523 20.5 29 20.5H3Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

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

@@ -0,0 +1,15 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M8.4 7.9C7.90294 7.9 7.5 7.49706 7.5 7C7.5 6.50294 7.90294 6.1 8.4 6.1H23.6C24.0971 6.1 24.5 6.50294 24.5 7C24.5 7.49706 24.0971 7.9 23.6 7.9H8.4Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M23.6 21.9C24.0971 21.9 24.5 21.4971 24.5 21C24.5 20.5029 24.0971 20.1 23.6 20.1H8.4C7.90294 20.1 7.5 20.5029 7.5 21C7.5 21.4971 7.90294 21.9 8.4 21.9H23.6Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M24.5 25C24.5 25.4971 24.0971 25.9 23.6 25.9H8.4C7.90294 25.9 7.5 25.4971 7.5 25C7.5 24.5029 7.90294 24.1 8.4 24.1H23.6C24.0971 24.1 24.5 24.5029 24.5 25Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M24.102 11.6689C24.4715 11.3364 24.5014 10.7674 24.1689 10.3979C23.8364 10.0285 23.2673 9.99851 22.8979 10.331L18.3142 14.4563L13.3824 12.4837L7.98381 16.2627C7.57661 16.5477 7.47758 17.1089 7.76262 17.5161C8.04767 17.9233 8.60884 18.0223 9.01605 17.7373L13.6174 14.5163L18.6857 16.5436L24.102 11.6689Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M3 4C3 2.89543 3.89543 2 5 2H27C28.1046 2 29 2.89543 29 4V28C29 29.1046 28.1046 30 27 30H5C3.89543 30 3 29.1046 3 28V4ZM5 4H27V28H5L5 4Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path d="M24.102 11.6689C24.4715 11.3364 24.5014 10.7674 24.1689 10.3979C23.8364 10.0285 23.2673 9.99851 22.8979 10.331L18.3142 14.4563L13.3824 12.4837L7.98381 16.2627C7.57661 16.5477 7.47758 17.1089 7.76262 17.5161C8.04767 17.9233 8.60884 18.0223 9.01605 17.7373L13.6174 14.5163L18.6857 16.5436L24.102 11.6689Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,15 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M8.4 7.9C7.90294 7.9 7.5 7.49706 7.5 7C7.5 6.50294 7.90294 6.1 8.4 6.1H23.6C24.0971 6.1 24.5 6.50294 24.5 7C24.5 7.49706 24.0971 7.9 23.6 7.9H8.4Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M23.6 21.9C24.0971 21.9 24.5 21.4971 24.5 21C24.5 20.5029 24.0971 20.1 23.6 20.1H8.4C7.90294 20.1 7.5 20.5029 7.5 21C7.5 21.4971 7.90294 21.9 8.4 21.9H23.6Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M24.5 25C24.5 25.4971 24.0971 25.9 23.6 25.9H8.4C7.90294 25.9 7.5 25.4971 7.5 25C7.5 24.5029 7.90294 24.1 8.4 24.1H23.6C24.0971 24.1 24.5 24.5029 24.5 25Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M24.102 11.6689C24.4715 11.3364 24.5014 10.7674 24.1689 10.3979C23.8364 10.0285 23.2673 9.99851 22.8979 10.331L18.3142 14.4563L13.3824 12.4837L7.98381 16.2627C7.57661 16.5477 7.47758 17.1089 7.76262 17.5161C8.04767 17.9233 8.60884 18.0223 9.01605 17.7373L13.6174 14.5163L18.6857 16.5436L24.102 11.6689Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M3 4C3 2.89543 3.89543 2 5 2H27C28.1046 2 29 2.89543 29 4V28C29 29.1046 28.1046 30 27 30H5C3.89543 30 3 29.1046 3 28V4ZM5 4H27V28H5L5 4Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path d="M24.102 11.6689C24.4715 11.3364 24.5014 10.7674 24.1689 10.3979C23.8364 10.0285 23.2673 9.99851 22.8979 10.331L18.3142 14.4563L13.3824 12.4837L7.98381 16.2627C7.57661 16.5477 7.47758 17.1089 7.76262 17.5161C8.04767 17.9233 8.60884 18.0223 9.01605 17.7373L13.6174 14.5163L18.6857 16.5436L24.102 11.6689Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

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

@@ -0,0 +1,8 @@
+<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="M18.0999 3.5C18.7074 3.5 19.1999 3.99249 19.1999 4.6L19.2 14H25.9999C28.2642 14 30.0999 15.8356 30.0999 18.1L30.0998 24.5C30.0998 26.7644 28.2642 28.6 25.9998 28.6H18.9987C17.8941 28.6 16.9987 27.7046 16.9987 26.6L16.9988 14H17L16.9999 4.6C16.9999 3.99249 17.4924 3.5 18.0999 3.5ZM19.1999 26.4H25.9998C27.0491 26.4 27.8998 25.5494 27.8998 24.5L27.8999 18.1C27.8999 17.0507 27.0492 16.2 25.9999 16.2H19.2L19.1999 26.4Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M5.49989 18.9C3.23554 18.9 1.39991 20.7356 1.39991 23L1.3999 24.5C1.3999 26.7644 3.23553 28.6 5.49988 28.6H13.0998C14.2044 28.6 15.0998 27.7046 15.0998 26.6V17.5C15.0998 15.2357 13.2642 13.4 10.9998 13.4H4.49989C3.89238 13.4 3.39989 13.8925 3.39989 14.5C3.39989 15.1075 3.89238 15.6 4.49989 15.6H10.9998C12.0492 15.6 12.8998 16.4507 12.8998 17.5L12.8998 18.9H5.49989ZM12.8998 21.1L12.8998 26.4H5.49988C4.45055 26.4 3.59989 25.5494 3.59989 24.5L3.5999 23C3.5999 21.9507 4.45056 21.1 5.49989 21.1H12.8998Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

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

@@ -0,0 +1,8 @@
+<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="M18.0999 3.5C18.7074 3.5 19.1999 3.99249 19.1999 4.6L19.2 14H25.9999C28.2642 14 30.0999 15.8356 30.0999 18.1L30.0998 24.5C30.0998 26.7644 28.2642 28.6 25.9998 28.6H18.9987C17.8941 28.6 16.9987 27.7046 16.9987 26.6L16.9988 14H17L16.9999 4.6C16.9999 3.99249 17.4924 3.5 18.0999 3.5ZM19.1999 26.4H25.9998C27.0491 26.4 27.8998 25.5494 27.8998 24.5L27.8999 18.1C27.8999 17.0507 27.0492 16.2 25.9999 16.2H19.2L19.1999 26.4Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+    <path fill-rule="evenodd" clip-rule="evenodd"
+          d="M5.49989 18.9C3.23554 18.9 1.39991 20.7356 1.39991 23L1.3999 24.5C1.3999 26.7644 3.23553 28.6 5.49988 28.6H13.0998C14.2044 28.6 15.0998 27.7046 15.0998 26.6V17.5C15.0998 15.2357 13.2642 13.4 10.9998 13.4H4.49989C3.89238 13.4 3.39989 13.8925 3.39989 14.5C3.39989 15.1075 3.89238 15.6 4.49989 15.6H10.9998C12.0492 15.6 12.8998 16.4507 12.8998 17.5L12.8998 18.9H5.49989ZM12.8998 21.1L12.8998 26.4H5.49988C4.45055 26.4 3.59989 25.5494 3.59989 24.5L3.5999 23C3.5999 21.9507 4.45056 21.1 5.49989 21.1H12.8998Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/merge/merge.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="M2 4C2 2.89543 2.89543 2 4 2H28C29.1046 2 30 2.89543 30 4V28C30 29.1046 29.1046 30 28 30H4C2.89543 30 2 29.1046 2 28V4ZM17 4H28V10H17V4ZM15 10V4H4V10H15ZM4 12V20H28V12H4ZM28 22H17V28H28V22ZM15 22H4L4 28H15V22Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/merge/merge_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="M2 4C2 2.89543 2.89543 2 4 2H28C29.1046 2 30 2.89543 30 4V28C30 29.1046 29.1046 30 28 30H4C2.89543 30 2 29.1046 2 28V4ZM17 4H28V10H17V4ZM15 10V4H4V10H15ZM4 12V20H28V12H4ZM28 22H17V28H28V22ZM15 22H4L4 28H15V22Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.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="M2 28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4C2.89543 2 2 2.89543 2 4V28ZM28 4H17V10H28V4ZM15 4V10H4V4H15ZM4 20V12H8.5V20H4ZM10.5 20V12H15V20H10.5ZM23.5 20H28V12H23.5V20ZM21.5 20V12H17V20H21.5ZM17 22H28V28H17V22ZM4 22H15V28H4L4 22Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_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="M2 28C2 29.1046 2.89543 30 4 30H28C29.1046 30 30 29.1046 30 28V4C30 2.89543 29.1046 2 28 2H4C2.89543 2 2 2.89543 2 4V28ZM28 4H17V10H28V4ZM15 4V10H4V4H15ZM4 20V12H8.5V20H4ZM10.5 20V12H15V20H10.5ZM23.5 20H28V12H23.5V20ZM21.5 20V12H17V20H21.5ZM17 22H28V28H17V22ZM4 22H15V28H4L4 22Z"
+          fill="#0A1C38" fill-opacity="0.29"/>
+</svg>

designer-base/src/main/resources/com/fine/theme/icon/noboder.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="M15 4H4V15H15V4ZM17 4V15H28V4H17ZM15 17H4V28H15V17ZM17 28V17H28V28H17ZM4 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"/>
+</svg>

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

@@ -0,0 +1,4 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg">
+    <path d="M10.4715 13L19.5285 13C19.9201 13 20.1404 13.3996 19.9 13.6738L15.3715 18.8388C15.1831 19.0537 14.8169 19.0537 14.6285 18.8388L10.1 13.6738C9.85957 13.3996 10.0799 13 10.4715 13Z"
+          fill="#0A1C38" fill-opacity="0.9"/>
+</svg>

designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java

@@ -3,10 +3,10 @@
  */
 package com.fr.design.actions.cell;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.NameStyle;
 import com.fr.base.Style;
-import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.mainframe.ElementCasePane;
@@ -60,7 +60,7 @@ public class BorderAction extends ElementCaseAction implements ChangeListener {
     public JComponent createToolBarComponent() {
         Object object = this.getValue(UIToolbarBorderButton.class.getName());
         if (object == null || !(object instanceof UIToolbarBorderButton)) {
-            UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(IconUtils.readIcon("/com/fr/design/standard/noboder"), this.getEditingComponent());
+            UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(new LazyIcon("noboder"), this.getEditingComponent());
             this.putValue(UIToolbarBorderButton.class.getName(), borderStylePane);
             borderStylePane.setEnabled(this.isEnabled());
             borderStylePane.set4Toolbar();

designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java

@@ -1,8 +1,7 @@
 package com.fr.design.actions.cell;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.CellBorderStyle;
-
-import com.fr.base.svg.IconUtils;
 import com.fr.design.dialog.BasicDialog;
 import com.fr.design.dialog.DialogActionAdapter;
 import com.fr.design.gui.ibutton.UIButton;
@@ -47,7 +46,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
 	private JPopupMenu popupWin;
 
 	public UIToolbarBorderButton(Icon icon, ElementCasePane reportPane) {
-		super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup")));
+		super(new UIButton(icon), new UIButton(new LazyIcon("popup")));
 		this.reportPane = reportPane;
 	}
 

designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java

@@ -1,31 +1,29 @@
 package com.fr.design.actions.cell.style;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.chart.BaseChartCollection;
-
-import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ButtonGroupAction;
 import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.mainframe.ElementCasePane;
-
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.Constants;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 
 public class AlignmentAction extends ButtonGroupAction implements StyleActionInterface {
 
     private static final Icon[][] ICONS = new Icon[][]{
-            {IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_left"), IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_left_selected.svg")},
+            {new LazyIcon("h_left"), new LazyIcon("h_left")},
-            {IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_center"), IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_center_selected.svg")},
+            {new LazyIcon("h_center"), new LazyIcon("h_center")},
-            {IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_right"), IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_right_selected.svg")}};
+            {new LazyIcon("h_right"), new LazyIcon("h_right")}};
 
 
     private static final Integer[] valueArray = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java

@@ -3,17 +3,16 @@
  */
 package com.fr.design.actions.cell.style;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.ToggleButtonUpdateAction;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.general.FRFont;
 
-
+import javax.swing.Icon;
-import javax.swing.*;
 
 /**
  * Bold.
@@ -21,7 +20,7 @@ import javax.swing.*;
 public class ReportFontBoldAction extends AbstractStyleAction implements ToggleButtonUpdateAction {
     private UIToggleButton button;
     protected Style style;
-    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/standard/bold/bold"), IconUtils.readIcon("/com/fr/design/standard/bold/bold_selected.svg")};
+	private final static Icon[] ICONS = {new LazyIcon("bold"), new LazyIcon("bold")};
 
     public ReportFontBoldAction(ElementCasePane t) {
         super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java

@@ -3,10 +3,9 @@
  */
 package com.fr.design.actions.cell.style;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-
-import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.style.color.UIToolbarColorButton;
@@ -51,7 +50,7 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C
 	public JComponent createToolBarComponent() {
 		Object object = this.getValue(UIToolbarColorButton.class.getName());
 		if (object == null || !(object instanceof UIToolbarColorButton)) {
-			UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/standard/foreground"));
+			UIToolbarColorButton tbButton = new UIToolbarColorButton(new LazyIcon("foreground"));
 			this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 			tbButton.set4Toolbar();
 			tbButton.setEnabled(this.isEnabled());

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java

@@ -3,21 +3,20 @@
  */
 package com.fr.design.actions.cell.style;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.IconUtils;
-import com.fr.general.FRFont;
-
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.FRFont;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 /**
  * Bold.
  */
 public class ReportFontItalicAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/standard/italic/italic"), IconUtils.readIcon("/com/fr/design/standard/italic/italic_selected.svg")};
+    private final static Icon[] ICONS = {new LazyIcon("italic"), new LazyIcon("italic")};
 
     public ReportFontItalicAction(ElementCasePane t) {
 		super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java

@@ -3,22 +3,21 @@
  */
 package com.fr.design.actions.cell.style;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.IconUtils;
-import com.fr.general.FRFont;
-
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.FRFont;
 import com.fr.stable.Constants;
 
-import javax.swing.*;
+import javax.swing.Icon;
 
 /**
  * Bold.
  */
 public class ReportFontUnderlineAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/standard/underline/underline"), IconUtils.readIcon("/com/fr/design/standard/underline/underline_selected.svg")};
+    private final static Icon[] ICONS = {new LazyIcon("underline"), new LazyIcon("underline")};
 
     public ReportFontUnderlineAction(ElementCasePane t) {
 		super(t);

designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java

@@ -3,21 +3,18 @@
  */
 package com.fr.design.actions.cell.style;
 
-import java.awt.Color;
+import com.fine.theme.icon.LazyIcon;
-
-import javax.swing.JComponent;
-import javax.swing.event.ChangeEvent;
-import javax.swing.event.ChangeListener;
-
 import com.fr.base.Style;
 import com.fr.base.background.ColorBackground;
-
-import com.fr.base.svg.IconUtils;
 import com.fr.design.actions.core.ActionFactory;
-import com.fr.general.ComparatorUtils;
-
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.style.color.UIToolbarColorButton;
+import com.fr.general.ComparatorUtils;
+
+import javax.swing.JComponent;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import java.awt.Color;
 
 /**
  * Background.
@@ -60,7 +57,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
         public JComponent createToolBarComponent() {
             Object object = this.getValue(UIToolbarColorButton.class.getName());
             if (object == null || !(object instanceof UIToolbarColorButton)) {
-                UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("com/fr/design/standard/background"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(new LazyIcon("background"));
                 tbButton.set4Toolbar();
                 this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 

designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java

@@ -4,9 +4,10 @@
 package com.fr.design.actions.edit.merge;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.ElementCaseAction;
-import com.fr.design.menu.KeySetUtils;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.menu.KeySetUtils;
 
 /**
  * merge cell..
@@ -21,7 +22,7 @@ public class MergeCellAction extends ElementCaseAction  {
         this.setMenuKeySet(KeySetUtils.MERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("/com/fr/design/standard/merge/merge");
+		this.setSmallIcon(new LazyIcon("merge"));
 	}
 
     /**

designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java

@@ -4,9 +4,10 @@
 package com.fr.design.actions.edit.merge;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.ElementCaseAction;
-import com.fr.design.menu.KeySetUtils;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.design.menu.KeySetUtils;
 
 /**
  * unmerge cell..
@@ -20,7 +21,7 @@ public class UnmergeCellAction extends ElementCaseAction {
         this.setMenuKeySet(KeySetUtils.UNMERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/unmerge/unmerge");
+        this.setSmallIcon(new LazyIcon("unmerge"));
     }
 
 	@Override

designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java

@@ -4,10 +4,10 @@
 package com.fr.design.actions.insert.cell;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
-
 import com.fr.report.cell.painter.BiasTextPainter;
 
 import javax.swing.KeyStroke;
@@ -30,7 +30,7 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor
         this.setMenuKeySet(INSERT_SLOPE_LINE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/bias/bias");
+        this.setSmallIcon(new LazyIcon("bias"));
     }
 
     public static final MenuKeySet INSERT_SLOPE_LINE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java

@@ -4,13 +4,13 @@
 package com.fr.design.actions.insert.cell;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
 
-
+import javax.swing.KeyStroke;
-import javax.swing.*;
 
 /**
  * .
@@ -29,7 +29,7 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo
 		this.setMenuKeySet(INSERT_CHART);
 		this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
 		this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon("/com/fr/design/standard/chart/chart");
+		this.setSmallIcon(new LazyIcon("chart"));
 	}
 
 	public static final MenuKeySet INSERT_CHART = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.actions.insert.cell;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.dscolumn.DSColumnPane;
 import com.fr.design.mainframe.ElementCasePane;
@@ -22,7 +23,7 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/bindcolunm/bind_column");
+        this.setSmallIcon(new LazyIcon("bind_column"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java

@@ -3,14 +3,13 @@
  */
 package com.fr.design.actions.insert.cell;
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.base.BaseFormula;
-
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
 
-
+import javax.swing.KeyStroke;
-import javax.swing.*;
 
 public class FormulaCellAction extends AbstractCellAction implements WorkBookSupportable {
     public FormulaCellAction() {
@@ -26,7 +25,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_FORMULA);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/formula/formula");
+        this.setSmallIcon(new LazyIcon("formula"));
     }
 
     public static final MenuKeySet INSERT_FORMULA = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java

@@ -4,12 +4,12 @@
 package com.fr.design.actions.insert.cell;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
 
-
+import javax.swing.KeyStroke;
-import javax.swing.*;
 import java.awt.event.ActionEvent;
 
 /**
@@ -29,7 +29,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup
         this.setMenuKeySet(INSERT_TEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/text/text");
+        this.setSmallIcon(new LazyIcon("text"));
     }
 
     public static final MenuKeySet INSERT_TEXT = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java

@@ -4,13 +4,13 @@
 package com.fr.design.actions.insert.cell;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
 
-
+import javax.swing.KeyStroke;
-import javax.swing.*;
+import java.awt.Image;
-import java.awt.*;
 
 /**
  * Image
@@ -29,7 +29,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo
         this.setMenuKeySet(INSERT_IMAGE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/image/image");
+        this.setSmallIcon(new LazyIcon("image"));
     }
 
     public static final MenuKeySet INSERT_IMAGE = new MenuKeySet() {

designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java

@@ -1,11 +1,11 @@
 package com.fr.design.actions.insert.cell;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.report.cell.cellattr.core.RichText;
 
 import javax.swing.KeyStroke;
@@ -25,7 +25,7 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(INSERT_RICHTEXT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/richtext/richtext");
+        this.setSmallIcon(new LazyIcon("richtext"));
     }
 
     @Override

designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java

@@ -1,10 +1,10 @@
 package com.fr.design.actions.insert.cell;
 
 
+import com.fine.theme.icon.LazyIcon;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
 import com.fr.general.ComparatorUtils;
-
 import com.fr.report.cell.cellattr.core.SubReport;
 
 import javax.swing.KeyStroke;
@@ -24,7 +24,7 @@ public class SubReportCellAction extends AbstractCellAction {
         this.setMenuKeySet(INSERT_SUB_REPORT);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon("/com/fr/design/standard/subreport/sub_report");
+        this.setSmallIcon(new LazyIcon("sub_report"));
     }
 
     public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {