REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化

No.10: ①根据开发评审意见，新增SVGIconUtils工具类，之后读取图标都可以用工具类中的方法；②修改UpdateAction、MenuDef、UIButton适配工具类方法；③修改之前上传的图标读取方式以及一些初始化方式；④替换了菜单栏-单元格中的所有子项的图标

designer-base/src/main/java/com/fr/base/svg/IconType.java

@@ -0,0 +1,62 @@
+package com.fr.base.svg;
+
+import com.fr.stable.StringUtils;
+
+/**
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2020/12/22
+ */
+public enum IconType {
+
+    /**
+     * png图片转化的Icon
+     */
+    PNG(".png", 0),
+    /**
+     * svg图片转化的normalIcon
+     */
+    NORMAL_SVG("_normal", 1),
+    /**
+     * SVG图片转化的disabledIcon
+     */
+    DISABLED_SVG("_disabled", 2),
+    /**
+     * SVG图片转化的selectedIcon
+     */
+    SELECTED_SVG("_selected", 3);
+
+    private String iconType;
+    private int iconCode;
+
+    IconType(String iconType, int iconCode) {
+        this.iconType = iconType;
+        this.iconCode = iconCode;
+    }
+
+    public String getIconType() {
+        return iconType;
+    }
+
+    public void setIconType(String iconType) {
+        this.iconType = iconType;
+    }
+
+    public int getIconCode() {
+        return iconCode;
+    }
+
+    public void setIconCode(int iconCode) {
+        this.iconCode = iconCode;
+    }
+
+    public static String getIconType(int iconCode) {
+        for (IconType iconType : IconType.values()) {
+            if (iconType.getIconCode() == iconCode) {
+                return iconType.getIconType();
+            }
+        }
+        return StringUtils.EMPTY;
+    }
+
+}

designer-base/src/main/java/com/fr/base/svg/SVGIcon.java

@@ -1,8 +1,9 @@
 package com.fr.base.svg;
 
+import com.fr.general.IOUtils;
+
 import javax.swing.Icon;
 import java.awt.Component;
-import java.awt.Dimension;
 import java.awt.Graphics;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
@@ -52,7 +53,7 @@ public class SVGIcon implements Icon {
     }
 
     /**
-     * 外界读取高清图标，默认尺寸为16*16
+     * 读取高清图标
      * @param url
      * @return
      */
@@ -60,7 +61,8 @@ public class SVGIcon implements Icon {
         if (!url.startsWith(ICON_PREFIX)) {
             url = ICON_PREFIX + url;
         }
-        return new SVGIcon((BufferedImage) SVGLoader.load(url));
+        BufferedImage image = (BufferedImage) SVGLoader.load(url);
+        return image == null ? IOUtils.readIcon(url) : new SVGIcon(image);
     }
 
     /**
@@ -74,6 +76,7 @@ public class SVGIcon implements Icon {
         if (!url.startsWith(ICON_PREFIX)) {
             url = ICON_PREFIX + url;
         }
-        return new SVGIcon((BufferedImage) SVGLoader.load(url, width, height));
+        BufferedImage image = (BufferedImage) SVGLoader.load(url, width, height);
+        return image == null ? IOUtils.readIcon(url) : new SVGIcon(image);
     }
 }

designer-base/src/main/java/com/fr/base/svg/SVGIconUtils.java

@@ -0,0 +1,104 @@
+package com.fr.base.svg;
+
+import com.fr.general.IOUtils;
+import com.fr.log.FineLoggerFactory;
+
+import javax.swing.Icon;
+import javax.swing.ImageIcon;
+
+/**
+ * 主要是用来读取svgIcon的工具类
+ * @author Yvan
+ * @version 10.0
+ * Created by Yvan on 2020/12/23
+ */
+public class SVGIconUtils {
+
+    private static final String ICON_SUFFIX_SVG = ".svg";
+    private static final String ICON_SUFFIX_PNG = ".png";
+    private static final String ICON_SUFFIX_GIF = ".gif";
+    private static final String SUFFIX_SEPARATOR = ".";
+
+    public static final String ICON_TYPE_NORMAL= "_normal.svg";
+    public static final String ICON_TYPE_DISABLED= "_disabled.svg";
+    public static final String ICON_TYPE_PRESSED= "_pressed.svg";
+
+
+    /**
+     * 可以读取SVG图标或者普通图标，并且可以读取不带扩展名的文件
+     * @param resource 图片路径
+     * @return 图标
+     */
+    public static Icon readIcon(String resource) {
+        // 判断是否有.XXX文件后缀
+        if (resource.contains(SUFFIX_SEPARATOR)) {
+            // 判断是否以.svg结尾
+            if (resource.endsWith(ICON_SUFFIX_SVG)) {
+                return SVGIcon.readSVGIcon(resource);
+            }
+            return IOUtils.readIcon(resource);
+        }
+        // 文件无后缀时
+        return readNoSuffixResource(resource, ICON_TYPE_NORMAL);
+    }
+
+    /**
+     * 尝试读取不带扩展名的图标，svg优先，其次png，最后gif，都没读到就打印错误日志，返回空白Icon
+     * @param resource 图片路径
+     * @param svgIconType 针对svg来说的图标类型
+     *                     取值为：ICON_TYPE_NORMAL、ICON_TYPE_DISABLED、ICON_TYPE_PRESSED
+     * @return 图标
+     */
+    private static Icon readNoSuffixResource(String resource, String svgIconType) {
+        String svgPath = resource + svgIconType;
+        if (IOUtils.readResource(svgPath) != null) {
+            return SVGIcon.readSVGIcon(svgPath);
+        }
+        String pngPath = resource + ICON_SUFFIX_PNG;
+        if (IOUtils.readResource(pngPath) != null) {
+            return IOUtils.readIcon(pngPath);
+        }
+        String gifPath = resource + ICON_SUFFIX_GIF;
+        if (IOUtils.readResource(gifPath) != null) {
+            return IOUtils.readIcon(gifPath);
+        }
+        FineLoggerFactory.getLogger().error(resource + "对应文件不存在");
+        return new ImageIcon();
+    }
+
+    /**
+     * 读取指定类型的svgIcon
+     * @param resource
+     * @param svgIconType
+     * @return
+     */
+    public static Icon readSVGIcon(String resource, String svgIconType) {
+        // 判断下是否有后缀
+        if (!resource.contains(SUFFIX_SEPARATOR)) {
+            return readNoSuffixResource(resource, svgIconType);
+        }
+        // 如果是".png"后缀，就替换为传入的svgIconType，然后读取图标
+        if (resource.endsWith(ICON_SUFFIX_PNG)) {
+            return readSpecifiedTypeIcon(resource, ICON_SUFFIX_PNG, svgIconType);
+        }
+        // 如果是"_XXXXXX.svg"后缀
+        if (resource.endsWith(ICON_TYPE_NORMAL)) {
+            return readSpecifiedTypeIcon(resource, ICON_TYPE_NORMAL, svgIconType);
+        }
+        if (resource.endsWith(ICON_TYPE_DISABLED)) {
+            return readSpecifiedTypeIcon(resource, ICON_TYPE_DISABLED, svgIconType);
+        }
+        if (resource.endsWith(ICON_TYPE_PRESSED)) {
+            return readSpecifiedTypeIcon(resource, ICON_TYPE_PRESSED, svgIconType);
+        }
+        return readIcon(resource);
+    }
+
+    private static Icon readSpecifiedTypeIcon(String resource, String oldSuffix, String newSuffix) {
+        String iconPath = resource.replace(oldSuffix, newSuffix);
+        if (IOUtils.readResource(iconPath) != null) {
+            return SVGIcon.readSVGIcon(iconPath);
+        }
+        return readIcon(resource);
+    }
+}

designer-base/src/main/java/com/fr/base/svg/SVGLoader.java

@@ -26,7 +26,11 @@ public class SVGLoader {
     @Nullable
     public static Image load(@NotNull String url) {
         try {
-            return load(IOUtils.getResource(url, SVGLoader.class), SVGIcon.SYSTEM_SCALE);
+            URL resource = IOUtils.getResource(url, SVGLoader.class);
+            if (resource == null) {
+                return null;
+            }
+            return load(resource, SVGIcon.SYSTEM_SCALE);
         } catch (IOException ignore) {
             return null;
         }
@@ -43,8 +47,8 @@ public class SVGLoader {
             String svgUri = url.toString();
             TranscoderInput input = new TranscoderInput(svgUri);
             return SVGTranscoder.createImage(scale, input).getImage();
-        } catch (TranscoderException e) {
+        } catch (TranscoderException ignore) {
-            throw new IOException(e);
+            return null;
         }
     }
 
@@ -55,8 +59,8 @@ public class SVGLoader {
             TranscoderInput input = new TranscoderInput(svgUri);
             return SVGTranscoder.createImage(scale, input,
                     (float) (dimension.getWidth() * scale), (float) (dimension.getHeight() * scale)).getImage();
-        } catch (TranscoderException e) {
+        } catch (TranscoderException ignore) {
-            throw new IOException(e);
+            return null;
         }
     }
 
@@ -67,16 +71,19 @@ public class SVGLoader {
             String svgUri = url.toString();
             TranscoderInput input = new TranscoderInput(svgUri);
             return SVGTranscoder.createImage(scale, input, (float) (overriddenWidth * scale), (float) (overriddenHeight * scale)).getImage();
-        } catch (TranscoderException e) {
+        } catch (TranscoderException ignore) {
-            throw new IOException(e);
+            return null;
         }
     }
 
     @Nullable
     public static Image load(@NotNull String url, float width, float height) {
         try {
-            String svgUri = IOUtils.getResource(url, SVGLoader.class).toString();
+            URL resource = IOUtils.getResource(url, SVGLoader.class);
-            TranscoderInput input = new TranscoderInput(svgUri);
+            if (resource == null) {
+                return null;
+            }
+            TranscoderInput input = new TranscoderInput(resource.toString());
             return SVGTranscoder.createImage(SVGIcon.SYSTEM_SCALE, input, -1, -1, width, height).getImage();
         } catch (TranscoderException ignore) {
             return null;

designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions;
 
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.menu.KeySetUtils;
@@ -22,7 +22,7 @@ public class AllowAuthorityEditAction extends TemplateComponentAction {
         this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT);
         this.setName(getMenuKeySet().getMenuName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/allow_authority_edit_normal.svg"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/ExitAuthorityEditAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.actions;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.data.datapane.TableDataTreePane;
 import com.fr.design.DesignModelAdapter;
@@ -19,7 +20,7 @@ public class ExitAuthorityEditAction extends TemplateComponentAction {
 	public ExitAuthorityEditAction(TargetComponent t) {
 		super(t);
 		this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Authority_Edit_Status_Exit"));
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit.png"));
+		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_report/exit_authority_edit_normal.svg"));
 	}
 
 

designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions;
 
 import javax.swing.SwingUtilities;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.data.DesignTableDataManager;
 import com.fr.data.TableDataSource;
 import com.fr.design.data.datapane.ReportTableDataPane;
@@ -26,7 +26,7 @@ public class TableDataSourceAction extends TemplateComponentAction<JTemplate<?,
         this.setMenuKeySet(KeySetUtils.TEMPLATE_TABLE_DATA_SOURCE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_web/datasource_normal.svg"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/datasource_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/UpdateAction.java

@@ -6,6 +6,8 @@ package com.fr.design.actions;
 import com.fr.base.NameStyle;
 import com.fr.base.ScreenResolution;
 import com.fr.base.Style;
+import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButton;
@@ -172,6 +174,31 @@ public abstract class UpdateAction extends ShortCut implements Action {
 		this.putValue(Action.SMALL_ICON, smallIcon);
 	}
 
+	/**
+	 * 使用传入资源url的方式设置Icon，可以自动设置对应的"_normal.svg"、"_disabled.svg"
+	 * 但是要保证文件名的统一，例如a.png对应a_normal.svg、a_disabled.svg
+	 * 如果a_disabled.svg或者a_pressed.svg缺失，则不会被设置成灰化状态或者按压状态图标
+	 * 如果a_normal.svg缺失，则会读到a.png，这也就不是一个SVGIcon了
+	 * 如果连 a.png 也不存在，那么这个action的图标就是空白的
+	 * @param resource
+	 */
+	public void setSmallIcon(String resource) {
+		this.putValue(Action.SMALL_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_NORMAL));
+		this.putValue(UpdateAction.DISABLED_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_DISABLED));
+	}
+
+	/**
+	 * 使用方式同上，但这个可以多设置一个PressedIcon
+	 * 设计器里面用到的比较少，因此与上面的方法区分一下，避免设计器启动的时候有过多无用操作
+	 * @param resource
+	 * @param needPressedIcon
+	 */
+	public void setSmallIcon(String resource, boolean needPressedIcon) {
+		this.putValue(Action.SMALL_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_NORMAL));
+		this.putValue(UpdateAction.DISABLED_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_DISABLED));
+		this.putValue(UpdateAction.PRESSED_ICON, SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_PRESSED));
+	}
+
 	public void setSmallIcon(Icon[] smallIcon, boolean white) {
 		this.putValue(Action.SMALL_ICON, smallIcon);
 	}
@@ -622,14 +649,14 @@ public abstract class UpdateAction extends ShortCut implements Action {
 
 	private void setPressedIcon4Button(AbstractButton button) {
 		Icon pressedIcon = (Icon) this.getValue(UpdateAction.PRESSED_ICON);
-		if (pressedIcon != null) {
+		if (pressedIcon != null && pressedIcon instanceof SVGIcon) {
 			button.setPressedIcon(pressedIcon);
 		}
 	}
 
 	private void setDisabledIcon4Button(AbstractButton button) {
 		Icon disabledIcon = (Icon) this.getValue(UpdateAction.DISABLED_ICON);
-		if (disabledIcon != null) {
+		if (disabledIcon != null && disabledIcon instanceof SVGIcon) {
 			button.setDisabledIcon(disabledIcon);
 		}
 	}

designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java

@@ -3,7 +3,6 @@
  */
 package com.fr.design.actions.edit;
 
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.TemplateComponentAction;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
@@ -22,8 +21,7 @@ public class CopyAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"));
         this.setMnemonic('C');
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/copy.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_disabled.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }

designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java

@@ -3,10 +3,10 @@
  */
 package com.fr.design.actions.edit;
 
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.TemplateComponentAction;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
+import com.fr.general.IOUtils;
 
 import javax.swing.KeyStroke;
 import java.awt.event.KeyEvent;
@@ -25,8 +25,7 @@ public class CutAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
         this.setMnemonic('T');
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/cut.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_disabled.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());
     }

designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java

@@ -3,7 +3,6 @@
  */
 package com.fr.design.actions.edit;
 
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.TemplateComponentAction;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.TargetComponent;
@@ -25,8 +24,7 @@ public class PasteAction extends TemplateComponentAction {
 
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
         this.setMnemonic('P');
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/paste.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_disabled.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
     }
 

designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java

@@ -5,7 +5,6 @@ package com.fr.design.actions.edit;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.TemplateComponentActionInterface;
 import com.fr.design.actions.UpdateAction;
@@ -23,8 +22,7 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI
         this.setMenuKeySet(KeySetUtils.REDO);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/edit/redo_normal.svg"));
+		this.setSmallIcon("com/fr/design/images/m_edit/redo.png");
-		this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/redo_disabled.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
 	}
 

designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java

@@ -5,7 +5,6 @@ package com.fr.design.actions.edit;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.actions.TemplateComponentActionInterface;
 import com.fr.design.actions.UpdateAction;
@@ -23,8 +22,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
         this.setMenuKeySet(KeySetUtils.UNDO);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/edit/undo_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/undo.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/undo_disabled.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.menu.KeySetUtils;
@@ -22,7 +22,7 @@ public class OpenTemplateAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/open_normal.svg"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/open_normal.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java

@@ -5,7 +5,7 @@ package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.KeySetUtils;
@@ -20,7 +20,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
         this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/saveAs_normal.svg"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_file/saveAs_normal.svg"));
     }
 
     /**

designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java

@@ -5,7 +5,6 @@ package com.fr.design.actions.file;
 
 import java.awt.event.ActionEvent;
 
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.menu.KeySetUtils;
@@ -21,8 +20,7 @@ public class SaveTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
         this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/save_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/m_file/save.png");
-		this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/save_disabled.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
 	}
 

designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@@ -1,6 +1,6 @@
 package com.fr.design.actions.file;
 
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.EnvChangeEntrance;
 import com.fr.design.actions.UpdateAction;
@@ -25,7 +25,7 @@ public class SwitchExistEnv extends MenuDef {
         Iterator<String> nameIt = DesignerEnvManager.getEnvManager().getEnvNameIterator();
         while (nameIt.hasNext()) {
             String name = nameIt.next();
-            this.setIconPath("com/fr/design/images/m_file/switch_normal.svg", true);
+            this.setIconPath("com/fr/design/images/m_file/switch_normal.svg");
             this.addShortCut(new GetExistEnvAction(name));
         }
         this.addShortCut(SeparatorDef.DEFAULT);
@@ -42,11 +42,11 @@ public class SwitchExistEnv extends MenuDef {
             DesignerWorkspaceInfo env = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName);
             switch (env.getType()) {
                 case Local: {
-                    this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/data/bind/local_connect_normal.svg"));
+                    this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/images/data/bind/localconnect_normal.svg"));
                     break;
                 }
                 case Remote: {
-                    this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/data/bind/distance_connect_normal.svg"));
+                    this.setSmallIcon(SVGIconUtils.readIcon("com/fr/design/images/data/bind/distanceconnect_normal.svg"));
                     break;
                 }
             }

designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java

@@ -1,5 +1,6 @@
 package com.fr.design.actions.server;
 
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.data.impl.Connection;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.data.datapane.connect.ConnectionShowPane;
@@ -11,7 +12,6 @@ import com.fr.stable.os.support.OSBasedAction;
 import com.fr.stable.os.support.OSSupportCenter;
 import com.fr.design.os.impl.DatabaseDialogAction;
 import com.fr.file.ConnectionConfig;
-import com.fr.general.IOUtils;
 
 import javax.swing.*;
 import java.awt.event.ActionEvent;
@@ -26,7 +26,7 @@ public class ConnectionListAction extends UpdateAction {
         this.setMenuKeySet(DEFINE_DATA_CONNECTION);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_web/connection.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_web/connection_normal.svg"));
         this.generateAndSetSearchText(DatabaseConnectionPane.JDBC.class.getName());
     }
 
@@ -96,4 +96,4 @@ public class ConnectionListAction extends UpdateAction {
     public void update() {
         this.setEnabled(true);
     }
-}
+}

designer-base/src/main/java/com/fr/design/constants/UIConstants.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.constants;
 
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.general.IOUtils;
 import com.fr.stable.Constants;
 
@@ -180,7 +180,7 @@ public interface UIConstants {
     public static final Icon YES_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/yes.png");
     public static final Icon CHOOSEN_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/select_item.png");
     public static final Icon PRE_WIDGET_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/prewidget.png");
-    public static final Icon PRE_WIDGET_NORMAL_ICON = SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/prewidget_normal.svg", 30, 20);
+    public static final Icon PRE_WIDGET_NORMAL_ICON = SVGIconUtils.readIcon("com/fr/design/images/buttonicon/prewidget_normal.svg");
     public static final Icon EDIT_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editn.png");
     public static final Icon EDIT_PRESSED_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/editp.png");
     public static final Icon HIDE_NORMAL_ICON = IOUtils.readIcon("com/fr/design/images/buttonicon/hiden.png");

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

@@ -2,7 +2,6 @@ package com.fr.design.data;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
-import com.fr.base.svg.SVGIcon;
 import com.fr.data.TableDataSource;
 import com.fr.data.api.StoreProcedureAssist;
 import com.fr.data.impl.storeproc.StoreProcedure;
@@ -399,8 +398,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         public PreviewTableDataAction(TableDataTree dataTree) {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Preview"));
             this.setMnemonic('p');
-            this.setSmallIcon(SVGIcon.readSVGIcon(IconPathConstants.PREVIEW_NORMAL_ICON_PATH));
+            this.setSmallIcon(IconPathConstants.PREVIEW_ICON_PATH);
-            this.setDisabledIcon(SVGIcon.readSVGIcon(IconPathConstants.PREVIEW_DISABLED_ICON_PATH));
             this.dataTree = dataTree;
         }
 
@@ -439,7 +437,7 @@ public abstract class BasicTableDataTreePane extends DockingView implements Resp
         public ConnectionTableAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Define_Data_Connection"));
             this.setMnemonic('D');
-            this.setSmallIcon(SVGIcon.readSVGIcon(IconPathConstants.TD_CONNECTION_NORMAL_ICON_PATH));
+            this.setSmallIcon(IconPathConstants.TD_CONNECTION_ICON_PATH);
         }
     }
 

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

@@ -1,7 +1,6 @@
 package com.fr.design.data.datapane;
 
 import com.fr.base.TableData;
-import com.fr.base.svg.SVGIcon;
 import com.fr.data.TableDataSource;
 import com.fr.data.impl.TableDataSourceDependent;
 import com.fr.design.DesignModelAdapter;
@@ -279,8 +278,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public EditAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Edit"));
             this.setMnemonic('E');
-            this.setSmallIcon(SVGIcon.readSVGIcon(IconPathConstants.TD_EDIT_NORMAL_ICON_PATH));
+            this.setSmallIcon(IconPathConstants.TD_EDIT_ICON_PATH);
-            this.setDisabledIcon(SVGIcon.readSVGIcon(IconPathConstants.TD_EDIT_DISABLED_ICON_PATH));
         }
 
         public void actionPerformed(ActionEvent e) {
@@ -298,8 +296,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public RemoveAction() {
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remove"));
             this.setMnemonic('R');
-            this.setSmallIcon(SVGIcon.readSVGIcon(IconPathConstants.TD_REMOVE_NORMAL_ICON_PATH));
+            this.setSmallIcon(IconPathConstants.TD_REMOVE_ICON_PATH);
-            this.setDisabledIcon(SVGIcon.readSVGIcon(IconPathConstants.TD_REMOVE_DISABLED_ICON_PATH));
         }
 
         @Override

designer-base/src/main/java/com/fr/design/gui/core/WidgetOption.java

@@ -1,7 +1,7 @@
 package com.fr.design.gui.core;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.form.ui.*;
 import com.fr.general.ComparatorUtils;
 
@@ -128,27 +128,27 @@ public abstract class WidgetOption implements Serializable {
     }
 
     public static final WidgetOption DATEEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Date"),
-            SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/date_16_normal.svg"),
+            SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/date_16_normal.svg"),
             DateEditor.class);
 
     public static final WidgetOption TREE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_View_Tree"),
-            SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/tree_16_normal.svg"), TreeEditor.class);
+            SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/tree_16_normal.svg"), TreeEditor.class);
 
-    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/combo_box_tree_16_normal.svg"),
+    public static final WidgetOption TREECOMBOBOX = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_ComboBox"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/comboboxtree16_normal.svg"),
             TreeComboBoxEditor.class);
 
     public static final WidgetOption CHECKBOXGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg"), CheckBoxGroup.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox_Group"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/checkbox_group_16_normal.svg"), CheckBoxGroup.class);
 
     public static final WidgetOption RADIOGROUP = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Radio_Group"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_group_16_normal.svg"),
             RadioGroup.class);
 
     public static final WidgetOption NUMBEREDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg"), NumberEditor.class);
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Number"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/number_field_16_normal.svg"), NumberEditor.class);
 
     public static final WidgetOption LABEL = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/label_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Label"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/label_16_normal.svg"),
             Label.class);
 
     public static final WidgetOption BUTTON = WidgetOptionFactory.createByWidgetClass(
@@ -156,23 +156,23 @@ public abstract class WidgetOption implements Serializable {
             Button.class);
 
     public static final WidgetOption FREEBUTTON = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/button_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Button"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/button_16_normal.svg"),
             FreeButton.class);
 
     public static final WidgetOption MULTI_FILEEDITOR = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/files_up_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_File"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/files_up_normal.svg"),
             MultiFileEditor.class);
 
     public static final WidgetOption COMBOBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Box"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_box_16_normal.svg"),
             ComboBox.class);
 
     public static final WidgetOption COMBOCHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Combo_Checkbox"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/combo_check_16_normal.svg"),
             ComboCheckBox.class);
 
     public static final WidgetOption CHECKBOX = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Checkbox"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/check_box_16_normal.svg"),
             CheckBox.class);
 
     public static final WidgetOption LIST = WidgetOptionFactory.createByWidgetClass(
@@ -182,16 +182,16 @@ public abstract class WidgetOption implements Serializable {
 
     public static final WidgetOption TEXTEDITOR = WidgetOptionFactory.createByWidgetClass(
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Text")
-            , SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg"),
+            , SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_field_16_normal.svg"),
             TextEditor.class);
 
     public static final WidgetOption TEXTAREA = WidgetOptionFactory.createByWidgetClass(
-            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg"),
+            com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Textarea"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/text_area_16_normal.svg"),
             TextArea.class);
 
     public static final WidgetOption PASSWORD = WidgetOptionFactory.createByWidgetClass(
             com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Type_Password"),
-            SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg"), Password.class);
+            SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/widget/password_field_16_normal.svg"), Password.class);
 
     public static final WidgetOption IFRAMEDITOR = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Form_Iframe"), BaseUtils.readIcon("/com/fr/web/images/form/resources/iframe_16.png"),
             IframeEditor.class);

designer-base/src/main/java/com/fr/design/gui/ibutton/UIButton.java

@@ -3,6 +3,7 @@ package com.fr.design.gui.ibutton;
 import com.fr.base.BaseUtils;
 import com.fr.base.CellBorderStyle;
 import com.fr.base.GraphHelper;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
@@ -97,6 +98,14 @@ public class UIButton extends JButton implements UIObserver, UITextComponent {
 		initListener();
 	}
 
+	public UIButton(String resource, boolean needSetDisabledIcon) {
+		super(SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_NORMAL));
+		if (needSetDisabledIcon) {
+			this.setDisabledIcon(SVGIconUtils.readSVGIcon(resource, SVGIconUtils.ICON_TYPE_DISABLED));
+		}
+		init();
+	}
+
 	protected void initListener() {
 		if (shouldResponseChangeListener()) {
 			this.addActionListener(new ActionListener() {
@@ -388,4 +397,4 @@ public class UIButton extends JButton implements UIObserver, UITextComponent {
 	public boolean shouldResponseChangeListener() {
 		return true;
 	}
-}
+}

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

@@ -32,7 +32,7 @@ public class IconPathConstants {
     public static final String TD_EDIT_DISABLED_ICON_PATH = "/com/fr/design/images/control/edit_disabled.svg";
     public static final String TD_EL_SHARE_HELP_ICON_PATH = "/com/fr/design/images/control/help_open.png";
     public static final String TD_EL_SHARE_CLOSE_ICON_PATH = "/com/fr/design/images/control/help_close.png";
-    public static final String TD_REMOVE_ICON_PATH = "/com/fr/design/images/control/tab/remove.png";
+    public static final String TD_REMOVE_ICON_PATH = "/com/fr/design/images/control/remove.png";
     public static final String TD_REMOVE_NORMAL_ICON_PATH = "/com/fr/design/images/control/remove_normal.svg";
     public static final String TD_REMOVE_DISABLED_ICON_PATH = "/com/fr/design/images/control/remove_disabled.svg";
     public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -2,7 +2,6 @@ package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
 import com.fr.base.extension.FileExtension;
-import com.fr.base.svg.SVGIcon;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignerEnvManager;
@@ -317,8 +316,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public NewFolderAction() {
 
             this.setName(KeySetUtils.NEW_FOLDER.getMenuKeySetName());
-            this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/new_folder_normal.svg"));
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/new_folder.png");
-            this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/new_folder_disabled.svg"));
         }
 
         @Override
@@ -344,8 +342,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
     private class VcsAction extends UpdateAction {
 
         public VcsAction() {
-            this.setSmallIcon(VcsHelper.VCS_LIST_NORMAL_SVG);
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/vcs_list.png");
-            this.setDisabledIcon(VcsHelper.VCS_LIST_DISABLED_SVG);
         }
 
         @Override
@@ -427,8 +424,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public ShowInExplorerAction() {
 
             this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_In_Containing_Folder"));
-            this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/view_folder_normal.svg"));
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/view_folder.png");
-            this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/view_folder_disabled.svg"));
         }
 
         @Override
@@ -445,7 +441,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public RefreshTreeAction() {
 
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Refresh"));
-            this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/refresh_normal.svg"));
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/refresh.png");
         }
 
         @Override
@@ -463,8 +459,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public RenameAction() {
 
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Rename"));
-            this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/rename_normal.svg"));
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/rename.png");
-            this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/rename_disabled.svg"));
         }
 
         @Override
@@ -503,8 +498,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
         public DelFileAction() {
 
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Remove"));
-            this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/remove_normal.svg"));
+            this.setSmallIcon("/com/fr/design/images/FileDealerPaneIcon/remove.png");
-            this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/remove_disabled.svg"));
         }
 
         @Override

designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java

@@ -1,7 +1,8 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.FRContext;
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -847,7 +848,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public void resetButtonIcon() {
             if (iconSuffix.equals(ICON_SUFFIX_SELECTED)) {
                 iconSuffix = ICON_SUFFIX_NORMAL;
-                button.setIcon(SVGIcon.readSVGIcon(getBtnIconUrl(), ICON_WIDTH, ICON_HEIGHT));
+                button.setIcon(SVGIconUtils.readIcon(getBtnIconUrl()));
                 button.setBackground(originBtnBackground);
                 button.setOpaque(false);
             }
@@ -856,7 +857,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         public void setTabButtonSelected() {
             resetPropertyIcons();
             iconSuffix = ICON_SUFFIX_SELECTED;
-            button.setIcon(SVGIcon.readSVGIcon(getBtnIconUrl(), ICON_WIDTH, ICON_HEIGHT));
+            button.setIcon(SVGIconUtils.readIcon(getBtnIconUrl()));
             button.setBackground(selectedBtnBackground);
             button.setOpaque(true);
             selectedItem = this;
@@ -867,7 +868,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
         }
 
         private void initButton() {
-            button = new UIButton(SVGIcon.readSVGIcon(getBtnIconUrl(), ICON_WIDTH, ICON_HEIGHT)) {
+            button = new UIButton(SVGIconUtils.readIcon(getBtnIconUrl())) {
                 public Dimension getPreferredSize() {
                     return new Dimension(TAB_BUTTON_WIDTH, TAB_BUTTON_HEIGHT);
                 }
@@ -876,7 +877,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer {
                     super.paintComponent(g);
                 }
             };
-            button.setDisabledIcon(SVGIcon.readSVGIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED, ICON_WIDTH, ICON_HEIGHT));
+            button.setDisabledIcon(SVGIconUtils.readIcon(getIconBaseDir() + btnIconName + ICON_SUFFIX_DISABLED));
             button.set4LargeToolbarButton();
             button.setUI(new UIButtonUI() {
                 @Override

designer-base/src/main/java/com/fr/design/mainframe/vcs/common/VcsHelper.java

@@ -1,6 +1,6 @@
 package com.fr.design.mainframe.vcs.common;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.concurrent.NamedThreadFactory;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.file.HistoryTemplateListCache;
@@ -40,8 +40,6 @@ public class VcsHelper implements JTemplateActionListener {
     public final static EmptyBorder EMPTY_BORDER_MEDIUM = new EmptyBorder(5, 10, 0, 10);
     public final static EmptyBorder EMPTY_BORDER_BOTTOM = new EmptyBorder(10, 10, 10, 10);
     public final static Icon VCS_LIST_PNG = IOUtils.readIcon("/com/fr/design/images/vcs/vcs_list.png");
-    public final static Icon VCS_LIST_NORMAL_SVG = SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/vcs_list_normal.svg");
-    public final static Icon VCS_LIST_DISABLED_SVG = SVGIcon.readSVGIcon("/com/fr/design/images/FileDealerPaneIcon/vcs_list_disabled.svg");
     public final static Icon VCS_BACK_PNG = IOUtils.readIcon("/com/fr/design/images/vcs/vcs_back.png");
     public final static Icon VCS_FILTER_PNG = IOUtils.readIcon("/com/fr/design/images/vcs/icon_filter@1x.png");
     public final static Icon VCS_EDIT_PNG = IOUtils.readIcon("/com/fr/design/images/vcs/icon_edit.png");

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

@@ -1,7 +1,6 @@
 package com.fr.design.menu;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.*;
 import com.fr.design.gui.iscrollbar.UIScrollBar;
@@ -41,7 +40,6 @@ public class MenuDef extends ShortCut {
     protected JPopupMenu popupMenu;
     protected boolean hasScrollSubMenu;
     protected boolean isHeadMenu;
-    private boolean isSVGIcon = false;
 
     private String anchor;
 
@@ -101,11 +99,6 @@ public class MenuDef extends ShortCut {
         this.iconPath = iconPath;
     }
 
-    public void setIconPath(String iconPath, boolean isSVGIcon) {
-        this.iconPath = iconPath;
-        this.isSVGIcon = isSVGIcon;
-    }
-
     public int getShortCutCount() {
         return this.shortcutList.size();
     }
@@ -173,7 +166,7 @@ public class MenuDef extends ShortCut {
     public UIButton createUIButton() {
         if (createdButton == null) {
             if (iconPath != null) {
-                createdButton = new UIButton(isSVGIcon ? SVGIcon.readSVGIcon(iconPath) : BaseUtils.readIcon(iconPath));
+                createdButton = new UIButton(SVGIconUtils.readIcon(iconPath));
                 createdButton.set4ToolbarButton();
             } else {
                 createdButton = new UIButton(name);
@@ -201,7 +194,7 @@ public class MenuDef extends ShortCut {
             createdJMenu = createJMenu0();
             createdJMenu.setMnemonic(this.getMnemonic());
             if (this.iconPath != null) {
-                createdJMenu.setIcon(isSVGIcon ? SVGIcon.readSVGIcon(iconPath) : BaseUtils.readIcon(iconPath));
+                createdJMenu.setIcon(SVGIconUtils.readIcon(iconPath));
             }
             MenuListener menuListener = createMenuListener();
             createdJMenu.addMenuListener(menuListener);

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -1,5 +1,6 @@
 package com.fr.design.report.fit.menupane;
 
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.JTemplateAction;
 import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.dialog.DialogActionAdapter;
@@ -65,7 +66,7 @@ public class ReportFitAttrAction extends JTemplateAction {
         }
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/reportfit/fit.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/reportfit/fit_normal.svg"));
     }
 
     /**

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

@@ -3,7 +3,8 @@
  */
 package com.fr.design.style.color;
 
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.event.UIObserver;
 import com.fr.design.event.UIObserverListener;
 import com.fr.design.gui.ibutton.UIButton;
@@ -34,7 +35,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
     private UIObserverListener uiObserverListener;
 
     public UIToolbarColorButton(Icon icon) {
-        super(new UIColorButton(icon), new UIButton(SVGIcon.readSVGIcon("/com/fr/design/images/gui/popup_normal.svg")));
+        super(new UIColorButton(icon), new UIButton(SVGIconUtils.readIcon("/com/fr/design/images/gui/popup_normal.svg")));
         getLeftButton().setEventBanned(true);
         getRightButton().addFocusListener(new FocusListener() {
 

designer-base/src/main/resources/com/fr/design/images/data/source/dataDictionary_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_形态_normal</title>
+    <g id="icon_形态_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14,1 L14,6 L5,6 L4.9998,4.0004 L3.9998,4.0004 L3.9998,5.0004 L2.9998,5.0004 L2.9998,4.0004 L1.9998,4.0004 L1.9998,13.0004 L4.9998,13.0004 L5,12 L14,12 L14,15 L5,15 L4.9998,14.0004 L0.9998,14.0004 L0.9998,3.0004 L2.9998,3.0004 L2.9998,2.0004 L3.9998,2.0004 L3.9998,3.0004 L4.9998,3.0004 L5,1 L14,1 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/edit/redo_disabled.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_重做_disabled</title>
+    <g id="icon_重做_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/edit/undo_disabled.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_撤销_disabled</title>
+    <g id="icon_撤销_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/expand/cellAttr_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_扩展_normal</title>
+    <g id="icon_扩展_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8,3 L8,5 L10,5 L10,7 L11.999,7 L11.999,8 L12,8 L12,14 L5,14 L5,12 L3,12 L3,10 L1,10 L1,3 L8,3 Z M11,8 L6.001,8 L6.001,13 L11,13 L11,8 Z M10,9 L10,12 L7,12 L7,9 L10,9 Z M9,6 L4,6 L4,11 L5,11 L5,7 L9,7 L9,6 Z M7,4 L2,4 L2,8.999 L3,8.999 L3,5 L7,5 L7,4 Z M13.999,2 L13.999,3 L14,3 L14,4 L15.001,4 L15.001,5 L14,5 L14,6 L13,6 L13,5 L12,5 L12,4 L13,4 L13,3 L9,3 L9,2 L13.999,2 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/redo_disabled.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_重做_disabled</title>
+    <g id="icon_重做_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/redo_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_重做_下拉列表用</title>
+    <g id="icon_重做_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000150) scale(-1, 1) translate(-8.000000, -8.000150) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/undo_disabled.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_撤销_disabled</title>
+    <g id="icon_撤销_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
+        <path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_edit/undo_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_撤销_下拉列表用</title>
+    <g id="icon_撤销_下拉列表用" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7.00012857,1 L7.00041488,4.28941483 C11.5001795,4.81880115 15,8.87653615 15,13.8037024 C15,14.2095383 14.9762561,14.6094758 14.9301652,15.0020289 C14.4180309,11.5986385 11.1305428,8.90901809 7.00070182,8.53101189 L7.00012857,11.7693787 L1,6.38415094 L7.00012857,1 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_file/repeatAndFrozen_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_重复与冻结设置_normal</title>
+    <g id="icon_重复与冻结设置_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,1 L15,7 L14,7 L14,6 L6,6 L6,8 L8,8 L8,9 L6,9 L6,11 L8,11 L8,12 L6,12 L6,14 L8,14 L8,15 L1,15 L1,1 L15,1 Z M15,15 L9,15 L9,10 L10,10 L10,8 L14,8 L14,10 L15,10 L15,15 Z M5,6 L2,6 L2,14 L5,14 L5,6 Z M13,12 L11,12 L11,13 L13,13 L13,12 Z M13,9 L11,9 L11,10 L13,10 L13,9 Z M14,2 L2,2 L2,5 L14,5 L14,2 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/cellAttr_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_其他属性_normal</title>
+    <g id="icon_其他属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M8,1 C8.82842712,1 9.5,1.67157288 9.5,2.5 L9.50046036,3.22904576 C9.78288379,3.31778001 10.0545064,3.43089947 10.3128604,3.56593636 L10.8284271,3.05025253 C11.4142136,2.46446609 12.363961,2.46446609 12.9497475,3.05025253 C13.5355339,3.63603897 13.5355339,4.58578644 12.9497475,5.17157288 L12.4340636,5.68713962 C12.5692611,5.94580091 12.6824891,6.21776239 12.7712708,6.50054746 L13.5,6.5 C14.3284271,6.5 15,7.17157288 15,8 C15,8.82842712 14.3284271,9.5 13.5,9.5 L12.7709542,9.50046036 C12.68222,9.78288379 12.5691005,10.0545064 12.4340636,10.3128604 L12.9497475,10.8284271 C13.5355339,11.4142136 13.5355339,12.363961 12.9497475,12.9497475 C12.363961,13.5355339 11.4142136,13.5355339 10.8284271,12.9497475 L10.3128604,12.4340636 C10.0545064,12.5691005 9.78288379,12.68222 9.50046036,12.7709542 L9.5,13.5 C9.5,14.3284271 8.82842712,15 8,15 C7.17157288,15 6.5,14.3284271 6.5,13.5 L6.50054746,12.7712708 C6.21776239,12.6824891 5.94580091,12.5692611 5.68713962,12.4340636 L5.17157288,12.9497475 C4.58578644,13.5355339 3.63603897,13.5355339 3.05025253,12.9497475 C2.46446609,12.363961 2.46446609,11.4142136 3.05025253,10.8284271 L3.56593636,10.3128604 C3.43089947,10.0545064 3.31778001,9.78288379 3.22904576,9.50046036 L2.5,9.5 C1.67157288,9.5 1,8.82842712 1,8 C1,7.17157288 1.67157288,6.5 2.5,6.5 L3.22872923,6.50054746 C3.31751095,6.21776239 3.43073885,5.94580091 3.56593636,5.68713962 L3.05025253,5.17157288 C2.46446609,4.58578644 2.46446609,3.63603897 3.05025253,3.05025253 C3.63603897,2.46446609 4.58578644,2.46446609 5.17157288,3.05025253 L5.68713962,3.56593636 C5.94580091,3.43073885 6.21776239,3.31751095 6.50054746,3.22872923 L6.5,2.5 C6.5,1.67157288 7.17157288,1 8,1 Z M8,6 C6.8954305,6 6,6.8954305 6,8 C6,9.1045695 6.8954305,10 8,10 C9.1045695,10 10,9.1045695 10,8 C10,6.8954305 9.1045695,6 8,6 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/highlight_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_属性_条件属性_normal</title>
+    <g id="icon_属性_条件属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M1,6 L2.5,6 C2.77614237,6 3,5.77614237 3,5.5 C3,5.22385763 2.77614237,5 2.5,5 L0.5,5 C0.361928813,5 0.236928813,5.05596441 0.146446609,5.14644661 C0.0559644063,5.23692881 0,5.36192881 0,5.5 L0,12.5 C0,12.6380712 0.0559644063,12.7630712 0.146446609,12.8535534 C0.236928813,12.9440356 0.361928813,13 0.5,13 L2.5,13 C2.77614237,13 3,12.7761424 3,12.5 C3,12.2238576 2.77614237,12 2.5,12 L1,12 L1,6 Z M5,3 L17,3 C17.5522847,3 18,3.44771525 18,4 L18,7 C18,7.55228475 17.5522847,8 17,8 L5,8 C4.44771525,8 4,7.55228475 4,7 L4,4 C4,3.44771525 4.44771525,3 5,3 Z M5,10 L14,10 C14.5522847,10 15,10.4477153 15,11 L15,14 C15,14.5522847 14.5522847,15 14,15 L5,15 C4.44771525,15 4,14.5522847 4,14 L4,11 C4,10.4477153 4.44771525,10 5,10 Z M6,6 L16,6 L16,5 L6,5 L6,6 Z M6,13 L13,13 L13,12 L6,12 L6,13 Z" id="Combined-Shape" fill="#62646E"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_format/modified_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_属性_控件设置_下拉列表用_normal</title>
+    <g id="icon_属性_控件设置_下拉列表用_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14.5,2 C14.7761424,2 15,2.22385763 15,2.5 L15,13.5 C15,13.7761424 14.7761424,14 14.5,14 L1.5,14 C1.22385763,14 1,13.7761424 1,13.5 L1,2.5 C1,2.22385763 1.22385763,2 1.5,2 L14.5,2 Z M13.8,3.2 L2.2,3.2 L2.2,12.8 L13.8,12.8 L13.8,3.2 Z M12.2174916,6 C12.383177,6 12.5174916,6.13431458 12.5174916,6.3 C12.5174916,6.35622591 12.5016907,6.4113202 12.4718911,6.45899968 L10.4283655,9.72864054 C10.3698235,9.82230785 10.2464334,9.85078248 10.1527661,9.79224042 C10.1270122,9.77614427 10.1052623,9.75439437 10.0891662,9.72864054 L8.04564067,6.45899968 C7.95782757,6.31849872 8.00053952,6.13341361 8.14104047,6.04560051 C8.18871995,6.01580083 8.24381424,6 8.30004016,6 L12.2174916,6 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/cell_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_属性_单元格元素_下拉列表用_normal</title>
+    <g id="icon_属性_单元格元素_下拉列表用_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M14.4,1 C14.7313708,1 15,1.26862916 15,1.60000002 C15,1.93137089 14.7313708,2.20000005 14.4,2.20000005 L11.2,2.2 L11.2,5 L14.4,5 C14.7313708,5 15,5.26862916 15,5.60000002 C15,5.93137089 14.7313708,6.20000005 14.4,6.20000005 L11.2,6.2 L11.2,10 L14.4,10 C14.7313708,10 15,10.2686292 15,10.6 C15,10.9313709 14.7313708,11.2 14.4,11.2 L11.2,11.2 L11.2,14.4 C11.2,14.7313708 10.9313709,15 10.6,15 C10.2686292,15 10,14.7313708 10,14.4 L10,11.2 L6.2,11.2 L6.20000005,14.4 C6.20000005,14.7313708 5.93137089,15 5.60000002,15 C5.26862916,15 5,14.7313708 5,14.4 L5,11.2 L2.2,11.2 L2.20000005,14.4 C2.20000005,14.7313708 1.93137089,15 1.60000002,15 C1.26862916,15 1,14.7313708 1,14.4 L1,1.60000002 C1,1.26862916 1.26862916,1 1.60000002,1 L14.4,1 Z M10,2.2 L2.2,2.2 L2.2,10 L10,10 L10,2.2 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/float_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_属性_悬浮元素_下拉列表用_normal</title>
+    <g id="icon_属性_悬浮元素_下拉列表用_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13.075,1 C13.4615993,1 13.775,1.31340068 13.775,1.70000001 L13.775,2.225 L14.3,2.22500008 C14.6865993,2.22500008 15,2.53840076 15,2.92500009 C15,3.31159942 14.6865993,3.6250001 14.3,3.6250001 L13.775,3.625 L13.775,12.375 L14.3,12.375 C14.6865993,12.375 15,12.6884007 15,13.075 C15,13.4615993 14.6865993,13.775 14.3,13.775 L13.775,13.775 L13.775,14.3 C13.775,14.6865993 13.4615993,15 13.075,15 C12.6884007,15 12.375,14.6865993 12.375,14.3 L12.375,13.775 L3.625,13.775 L3.6250001,14.3 C3.6250001,14.6865993 3.31159942,15 2.92500009,15 C2.53840076,15 2.22500008,14.6865993 2.22500008,14.3 L2.225,13.775 L1.70000001,13.775 C1.31340068,13.775 1,13.4615993 1,13.075 C1,12.6884007 1.31340068,12.375 1.70000001,12.375 L2.225,12.375 L2.225,3.625 L1.70000001,3.6250001 C1.31340068,3.6250001 1,3.31159942 1,2.92500009 C1,2.53840076 1.31340068,2.22500008 1.70000001,2.22500008 L2.225,2.225 L2.22500008,1.70000001 C2.22500008,1.31340068 2.53840076,1 2.92500009,1 C3.31159942,1 3.6250001,1.31340068 3.6250001,1.70000001 L3.625,2.225 L12.375,2.225 L12.375,1.70000001 C12.375,1.31340068 12.6884007,1 13.075,1 Z M12.375,3.625 L3.625,3.625 L3.625,12.375 L12.375,12.375 L12.375,3.625 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/hyperLink_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="18px" height="18px" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_属性_超级链接_normal</title>
+    <g id="icon_属性_超级链接_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7,5 C7.55228475,5 8,5.44771525 8,6 C8,6.55228475 7.55228475,7 7,7 L7,7 L4,7 C2.8954305,7 2,7.8954305 2,9 C2,10.1045695 2.8954305,11 4,11 L4,11 L7,11 C7.55228475,11 8,11.4477153 8,12 C8,12.5522847 7.55228475,13 7,13 L7,13 L4,13 C1.790861,13 0,11.209139 0,9 C0,6.790861 1.790861,5 4,5 L4,5 Z M14,5 C16.209139,5 18,6.790861 18,9 C18,11.209139 16.209139,13 14,13 L11,13 C10.4477153,13 10,12.5522847 10,12 C10,11.4477153 10.4477153,11 11,11 L14,11 C15.1045695,11 16,10.1045695 16,9 C16,7.8954305 15.1045695,7 14,7 L11,7 C10.4477153,7 10,6.55228475 10,6 C10,5.44771525 10.4477153,5 11,5 L14,5 Z M12,8 C12.5522847,8 13,8.44771525 13,9 C13,9.55228475 12.5522847,10 12,10 L6,10 C5.44771525,10 5,9.55228475 5,9 C5,8.44771525 5.44771525,8 6,8 L12,8 Z" id="Combined-Shape" fill="#62646E" fill-rule="nonzero" transform="translate(9.000000, 9.000000) rotate(45.000000) translate(-9.000000, -9.000000) "></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/insertColumn_normal.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_列_normal</title>
+    <g id="icon_列_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,1 C15.55,1 16,1.45 16,2 L16,15 C16,15.55 15.55,16 15,16 L2,16 C1.45,16 1,15.55 1,15 L1,2 C1,1.45 1.45,1 2,1 L15,1 Z M15,2 L2,2 L2,15 L15,15 L15,2 Z" id="Combined-Shape" fill="#333334"></path>
+        <path d="M14,14 L3,14 L3,3 L14,3 L14,14 Z M13,11 L13,10 L4,10 L4,11 L13,11 Z M13,9 L13,8 L4,8 L4,9 L13,9 Z M13,4 L4,4 L4,5 L13,5 L13,4 Z M13,13 L13,12 L4,12 L4,13 L13,13 Z M13,6 L4,6 L4,7 L13,7 L13,6 Z" id="Combined-Shape" fill="#333334"></path>
+        <polygon id="Fill-14" fill="#C1C5C9" points="5 13 6 13 6 3 5 3"></polygon>
+        <polygon id="Fill-15" fill="#C1C5C9" points="9 13 10 13 10 3 9 3"></polygon>
+        <polygon id="Fill-18" fill="#3E99DD" points="5 14 10 14 10 3 5 3"></polygon>
+        <polygon id="Fill-19" fill="#8FD6F2" points="6 13 9 13 9 4 6 4"></polygon>
+        <polygon id="Combined-Shape-Copy" fill="#3E99DD" transform="translate(7.500000, 1.000000) rotate(90.000000) translate(-7.500000, -1.000000) " points="7.5 -0.5 6.5 -0.5 6.5 2.5 7.5 2.5 8.5 1.5 8.5 0.5"></polygon>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_insert/insertRow_normal.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_行_normal</title>
+    <g id="icon_行_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M16,14 C16,14.55 15.55,15 15,15 L2,15 C1.45,15 1,14.55 1,14 L1,1 C1,0.45 1.45,0 2,0 L15,0 C15.55,0 16,0.45 16,1 L16,14 Z" id="Fill-1" fill="#333334"></path>
+        <polygon id="Fill-3" fill="#FFFFFF" points="2 14 15 14 15 1 2 1"></polygon>
+        <path d="M14,13 L3,13 L3,2 L14,2 L14,13 Z M5,11 L4,11 L4,12 L5,12 L5,11 Z M9,11 L6,11 L6,12 L9,12 L9,11 Z M9,5 L6,5 L6,10 L9,10 L9,5 Z M5,5 L4,5 L4,10 L5,10 L5,5 Z M13,3 L10,3 L10,4 L13,4 L13,3 Z M9,3 L6,3 L6,4 L9,4 L9,3 Z M5,3 L4,3 L4,4 L5,4 L5,3 Z M13,12 L13,11 L10,11 L10,12 L13,12 Z M13,5 L10,5 L10,10 L13,10 L13,5 Z" id="Combined-Shape" fill="#333334"></path>
+        <polygon id="Fill-9" fill="#C1C5C9" points="4 7 13 7 13 6 4 6"></polygon>
+        <polygon id="Fill-10" fill="#C1C5C9" points="4 9 13 9 13 8 4 8"></polygon>
+        <polygon id="Fill-18" fill="#3E99DD" points="3 9 14 9 14 6 3 6"></polygon>
+        <polygon id="Fill-19" fill="#8FD6F2" points="4 8 13 8 13 7 4 7"></polygon>
+        <polygon id="Combined-Shape" fill="#3E99DD" points="1 6 0 6 0 9 1 9 2 8 2 7"></polygon>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>icon_关闭_权限编辑_normal</title>
+    <title>icon_退出权限编辑_normal</title>
-    <g id="icon_关闭_权限编辑_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+    <g id="icon_退出权限编辑_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <circle id="Oval" fill="#419BF9" cx="12" cy="12" r="12"></circle>
+        <path d="M11,1 L11,5 L10,5 L10,2 L2,2 L2,14 L10,14 L10,11 L11,11 L11,15 L1,15 L1,1 L11,1 Z M12,5 L15.4316886,8 L12,11 L12,9.5 L6,9.5 L6,6.5 L12,6.5 L12,5 Z" id="形状结合" fill="#333334"></path>
-        <path d="M12,5 C12.3865993,5 12.7,5.3187139 12.7,5.69426218 L12.699,11.3 L18.3057378,11.3 C18.6572157,11.3 18.9476905,11.5610788 18.9936622,11.9044479 L19,12 C19,12.3865993 18.6812861,12.7 18.3057378,12.7 L12.699,12.699 L12.7,18.3057378 C12.7,18.6572157 12.4389212,18.9476905 12.0955521,18.9936622 L12,19 C11.6134007,19 11.3,18.6812861 11.3,18.3057378 L11.3,12.699 L5.69426218,12.7 C5.3427843,12.7 5.05230945,12.4389212 5.0063378,12.0955521 L5,12 C5,11.6134007 5.3187139,11.3 5.69426218,11.3 L11.3,11.3 L11.3,5.69426218 C11.3,5.3427843 11.5610788,5.05230945 11.9044479,5.0063378 L12,5 Z" id="Combined-Shape" fill="#FFFFFF" transform="translate(12.000000, 12.000000) rotate(45.000000) translate(-12.000000, -12.000000) "></path>
     </g>
 </svg>

designer-base/src/main/resources/com/fr/design/images/m_report/mobile_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_移动端属性_normal</title>
+    <g id="icon_移动端属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M13,1 L13,15 L3,15 L3,1 L13,1 Z M9,13 L7,13 L7,14 L9,14 L9,13 Z M12,2 L4,2 L4,12 L12,12 L12,2 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/m_web/style_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_样式_normal</title>
+    <g id="icon_样式_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M7.90463318,8.4867543 L10.2691,4.0001 L13.1361,4.0001 L15.0001,14.0001 L12.4271,14.0001 L12.1001,11.9781 L8.5271,11.9781 L7.5101,14.0001 L4.9991,14.0001 L7.6345216,8.9993 L6.1992,8.9993 L5.9702,7.5843 L3.4692,7.5843 L2.7572,8.9993 L1.0002,8.9993 L4.6882,2.0003 L6.6952,2.0003 L7.90463318,8.4867543 Z M11.2361,6.5621 L9.4371,10.1451 L11.8131,10.1451 L11.2361,6.5621 Z M5.3652,3.7933 L4.1072,6.3013 L5.7692,6.3013 L5.3652,3.7933 Z" id="Combined-Shape" fill="#333334"></path>
+    </g>
+</svg>

designer-base/src/main/resources/com/fr/design/images/reportfit/fit_normal.svg

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>icon_模板自适应属性_normal</title>
+    <g id="icon_模板自适应属性_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <path d="M15,1 L15,15 L1,15 L1,1 L15,1 Z M14,2 L2,2 L2,14 L14,14 L14,2 Z M4,9 L4,11 L5,11 L5,12 L7,12 L7,13 L3,13 L3,9 L4,9 Z M6,10 L6,11 L5,11 L5,10 L6,10 Z M7,9 L7,10 L6,10 L6,9 L7,9 Z M13,3 L13,7 L12,7 L12,5 L11,5 L11,6 L10,6 L10,5 L11,5 L11,4 L9,4 L9,3 L13,3 Z M10,6 L10,7 L9,7 L9,6 L10,6 Z" id="形状结合" fill="#333334" fill-rule="nonzero"></path>
+    </g>
+</svg>

designer-form/src/main/java/com/fr/design/actions/NewFormAction.java

@@ -1,7 +1,7 @@
 package com.fr.design.actions;
 
-import com.fr.base.svg.SVGIcon;
+
-import com.fr.design.actions.UpdateAction;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.mainframe.BaseJForm;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JTemplate;
@@ -21,7 +21,7 @@ public class NewFormAction extends UpdateAction {
         this.setMenuKeySet(NEW_FORM);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/new_form_for_dock_normal.svg"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/new_form_for_dock_normal.svg"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.designer.beans.actions;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
 import com.fr.design.mainframe.FormDesigner;
@@ -16,8 +16,7 @@ public class CopyAction extends FormWidgetEditAction {
         super(t);
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"));
         this.setMnemonic('C');
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/copy.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_disabled.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
         setUpdateBehavior(new ComponentEnable());
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());

designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java

@@ -1,6 +1,6 @@
 package com.fr.design.designer.beans.actions;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
 import com.fr.design.mainframe.FormDesigner;
@@ -16,8 +16,7 @@ public class CutAction extends FormWidgetEditAction {
         super(t);
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
         this.setMnemonic('T');
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/cut.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_disabled.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
         this.setUpdateBehavior(new ComponentEnable());
         this.setEnabled(!DesignModeContext.isBanCopyAndCut());

designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java

@@ -7,7 +7,7 @@ import java.awt.event.KeyEvent;
 
 import javax.swing.*;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
 
 import com.fr.design.mainframe.FormDesigner;
@@ -24,8 +24,7 @@ public class FormDeleteAction extends FormWidgetEditAction {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
         this.setMnemonic('D');
         // Richie:删除菜单图标
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/delete.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_disabled.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
         this.setUpdateBehavior(new ComponentEnable());
     }

designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java

@@ -1,6 +1,5 @@
 package com.fr.design.designer.beans.actions;
 
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.base.mode.DesignModeContext;
 import com.fr.design.mainframe.FormDesigner;
 
@@ -15,8 +14,7 @@ public class PasteAction extends FormWidgetEditAction {
         super(t);
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
         this.setMnemonic('P');
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/paste.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_disabled.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
     }
 

designer-form/src/main/java/com/fr/design/form/parameter/FormParaTargetMode.java

@@ -1,6 +1,7 @@
 package com.fr.design.form.parameter;
 
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.designer.creator.XCreatorUtils;
 import com.fr.design.designer.properties.WidgetPropertyTable;
 import com.fr.design.gui.core.WidgetOption;
@@ -27,7 +28,7 @@ public class FormParaTargetMode extends FormDesignerModeForSpecial<FormParaDesig
     public WidgetOption[] getPredefinedWidgetOptions() {
         return new WidgetOption[]{
                 WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
-                        SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
+                        SVGIconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
     }
 
     @Override

designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java

@@ -1,7 +1,7 @@
 package com.fr.design.gui.core;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.i18n.Toolkit;
 import com.fr.form.ui.ElementCaseEditor;
 import com.fr.form.ui.Widget;
@@ -75,13 +75,13 @@ public class FormWidgetOption extends WidgetOption {
         return new WidgetOption[] {CARDLAYOUTCONTAINER, ABSOLUTELAYOUTCONTAINER};
     }
 
-	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/absolute_layout_normal.svg"),
+	public static final WidgetOption ABSOLUTELAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Absolute"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/absolute_layout_normal.svg"),
 			WAbsoluteLayout.class);
 
 	public static final WidgetOption BORDERLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Report_Border_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/layout_border.png"),
 			WBorderLayout.class);
 
-	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/card_layout_16_normal.svg"),
+	public static final WidgetOption CARDLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_Block_Tab"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/card_layout_16_normal.svg"),
 			WCardLayout.class);
 
 	public static final WidgetOption HORIZONTALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Layout_HBox"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_h_16.png"),
@@ -94,9 +94,9 @@ public class FormWidgetOption extends WidgetOption {
 			BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
 			WFitLayout.class);
 
-	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/layout_parameter_normal.svg"),
+	public static final WidgetOption PARAMETERCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Parameter_Body"), SVGIconUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2_normal.svg"),
 			WParameterLayout.class);
 
-	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/report_16_normal.svg"),
+	public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("Fine-Design_Form_Report"), SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/report_16_normal.svg"),
 			ElementCaseEditor.class);
 }

designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java

@@ -1,7 +1,7 @@
 package com.fr.design.mainframe;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.beans.events.DesignerEditListener;
@@ -374,7 +374,7 @@ public class FormParaWidgetPane extends JPanel {
     private class paraButton extends ToolBarButton {
         public paraButton(WidgetOption no) {
             super(no);
-            this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/layout_parameter_disabled.svg"));
+            this.setDisabledIcon(SVGIconUtils.readIcon("/com/fr/web/images/form/resources/layout_parameter2_disabled.svg"));
             if (designer != null) {
                 this.setEnabled(designer.getParaComponent() == null);
             }

designer-form/src/main/java/com/fr/design/mainframe/FormTargetMode.java

@@ -2,7 +2,8 @@ package com.fr.design.mainframe;
 
 import java.util.ArrayList;
 
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.gui.core.WidgetOption;
 import com.fr.design.gui.core.WidgetOptionFactory;
 import com.fr.design.gui.itable.PropertyGroup;
@@ -22,7 +23,7 @@ public class FormTargetMode extends FormDesignerModeForSpecial<FormDesigner> {
 	public WidgetOption[] getPredefinedWidgetOptions() {
         return new WidgetOption[]{
                 WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Query_Button"),
-                        SVGIcon.readSVGIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
+                        SVGIconUtils.readIcon("/com/fr/web/images/form/resources/preview_16_normal.svg"), FormSubmitButton.class)};
     }
 
 	public ArrayList<PropertyGroup> createRootDesignerPropertyGroup() {

designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@@ -247,7 +247,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
 
     private MenuDef createWorkBookExportMenu() {
         MenuDef exportMenuDef = new MenuDef(KeySetUtils.EXPORT.getMenuName());
-        exportMenuDef.setIconPath("/com/fr/design/images/m_file/export_normal.svg", true);
+        exportMenuDef.setIconPath("/com/fr/design/images/m_file/export_normal.svg");
         exportMenuDef.addShortCut(new EmbeddedFormExportExportAction(this));
 
         return exportMenuDef;

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

@@ -1,6 +1,6 @@
 package com.fr.design.actions.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.menu.KeySetUtils;
 
 
@@ -12,7 +12,7 @@ public class CellAttributeAction extends CellAttributeTableAction {
         this.setMenuKeySet(KeySetUtils.CELL_OTHER_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		 this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellAttr.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellAttr_normal.svg"));
 	}
 
 	@Override
@@ -20,4 +20,4 @@ public class CellAttributeAction extends CellAttributeTableAction {
 		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Datasource_Other_Attributes");
 	}
 
-}
+}

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

@@ -1,6 +1,6 @@
 package com.fr.design.actions.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.menu.KeySetUtils;
 
 
@@ -11,7 +11,7 @@ public class CellExpandAttrAction extends  CellAttributeTableAction{
         this.setMenuKeySet(KeySetUtils.CELL_EXPAND_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
+		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/expand/cellAttr_normal.svg"));
 	}
 
 
@@ -21,4 +21,4 @@ public class CellExpandAttrAction extends  CellAttributeTableAction{
 		return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ExpandD_Expand_Attribute");
 	}
 
-}
+}

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

@@ -1,6 +1,7 @@
 package com.fr.design.actions.cell;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.menu.KeySetUtils;
@@ -16,7 +17,7 @@ public class CellWidgetAttrAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.CELL_WIDGET_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/modified.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/modified_normal.svg"));
     }
 
     @Override
@@ -30,4 +31,4 @@ public class CellWidgetAttrAction extends UpdateAction {
         super.update();
         this.setEnabled(EastRegionContainerPane.getInstance().isWidgetSettingsPaneEnabled());
     }
-}
+}

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

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.cell;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.menu.KeySetUtils;
@@ -18,7 +18,7 @@ public class ConditionAttributesAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.CONDITION_ATTR);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/highlight.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_format/highlight_normal.svg"));
     }
 
     @Override
@@ -32,4 +32,4 @@ public class ConditionAttributesAction extends UpdateAction {
         super.update();
         this.setEnabled(EastRegionContainerPane.getInstance().isConditionAttrPaneEnabled());
     }
-}
+}

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

@@ -3,7 +3,8 @@
  */
 package com.fr.design.actions.cell;
 
-import com.fr.base.BaseUtils;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.mainframe.ElementCasePane;
 
@@ -16,10 +17,10 @@ import java.awt.event.ActionEvent;
 public class EditCellAction extends ElementCaseAction {
 	public EditCellAction(ElementCasePane t) {
 		super(t);
-		
+
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
         this.setMnemonic('I');
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/control/edit_normal.svg"));
     }
 
     @Override
@@ -31,7 +32,7 @@ public class EditCellAction extends ElementCaseAction {
     		Toolkit.getDefaultToolkit().beep();
     	}
     }
-    
+
     // TODO ALEX_SEP 这里的undo redo又是怎么回事呢?
     @Override
     public boolean executeActionReturnUndoRecordNeeded() {

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

@@ -33,7 +33,7 @@ public class GlobalStyleMenuDef extends MenuDef {
         this.setMenuKeySet(KeySetUtils.GLOBAL_STYLE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setIconPath("/com/fr/design/images/m_web/style.png");
+        this.setIconPath("/com/fr/design/images/m_web/style_normal.svg");
     }
 
     protected ContainerListener getContainerListener() {

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

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

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

@@ -3,7 +3,8 @@ package com.fr.design.actions.cell.style;
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.chart.BaseChartCollection;
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.ButtonGroupAction;
 import com.fr.design.actions.utils.ReportActionUtils;
 import com.fr.design.constants.UIConstants;
@@ -22,9 +23,9 @@ import javax.swing.*;
 public class AlignmentAction extends ButtonGroupAction implements StyleActionInterface {
 
     private static final Icon[][] ICONS = new Icon[][]{
-            {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_left_selected.svg")},
+            {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_selected.svg")},
-            {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_center_selected.svg")},
+            {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_selected.svg")},
-            {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/h_right_selected.svg")}};
+            {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_selected.svg")}};
 
 
     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

@@ -5,7 +5,7 @@ package com.fr.design.actions.cell.style;
 
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.ToggleButtonUpdateAction;
 import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.mainframe.ElementCasePane;
@@ -21,7 +21,7 @@ import javax.swing.*;
 public class ReportFontBoldAction extends AbstractStyleAction implements ToggleButtonUpdateAction {
     private UIToggleButton button;
     protected Style style;
-    private final static Icon[] ICONS = {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/bold_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/bold_selected.svg")};
+    private final static Icon[] ICONS = {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_selected.svg")};
 
     public ReportFontBoldAction(ElementCasePane t) {
         super(t);

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

@@ -3,10 +3,10 @@
  */
 package com.fr.design.actions.cell.style;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.style.color.UIToolbarColorButton;
@@ -51,7 +51,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(SVGIcon.readSVGIcon("/com/fr/design/images/gui/color/foreground_normal.svg"));
+			UIToolbarColorButton tbButton = new UIToolbarColorButton(SVGIconUtils.readIcon("/com/fr/design/images/gui/color/foreground_normal.svg"));
 			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

@@ -5,7 +5,7 @@ package com.fr.design.actions.cell.style;
 
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.general.FRFont;
 
 import com.fr.design.mainframe.ElementCasePane;
@@ -17,7 +17,7 @@ import javax.swing.*;
  */
 public class ReportFontItalicAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/italic_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/italic_selected.svg")};
+    private final static Icon[] ICONS = {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_selected.svg")};
 
     public ReportFontItalicAction(ElementCasePane t) {
 		super(t);

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

@@ -5,7 +5,7 @@ package com.fr.design.actions.cell.style;
 
 import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
-import com.fr.base.svg.SVGIcon;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.general.FRFont;
 
 import com.fr.design.mainframe.ElementCasePane;
@@ -18,7 +18,7 @@ import javax.swing.*;
  */
 public class ReportFontUnderlineAction extends ReportFontBoldAction {
 
-    private final static Icon[] ICONS = {SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/underline_normal.svg"), SVGIcon.readSVGIcon("/com/fr/design/images/m_format/cellstyle/underline_selected.svg")};
+    private final static Icon[] ICONS = {SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_normal.svg"), SVGIconUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_selected.svg")};
 
     public ReportFontUnderlineAction(ElementCasePane t) {
 		super(t);

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

@@ -9,10 +9,10 @@ import javax.swing.JComponent;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.background.ColorBackground;
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.general.ComparatorUtils;
 
@@ -60,7 +60,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(SVGIcon.readSVGIcon("/com/fr/design/images/gui/color/background_normal.svg"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(SVGIconUtils.readIcon("/com/fr/design/images/gui/color/background_normal.svg"));
                 tbButton.set4Toolbar();
                 this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 

designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertColumnAction.java

@@ -4,6 +4,7 @@
 package com.fr.design.actions.columnrow;
 
 import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.CellSelectionAction;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -27,7 +28,7 @@ public class InsertColumnAction extends CellSelectionAction {
 
         this.setName(name);
         this.setMnemonic(INSERT_COLUMN.getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/insertColumn.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_insert/insertColumn_normal.svg"));
     }
 
     public static final MenuKeySet INSERT_COLUMN = new MenuKeySet() {
@@ -59,4 +60,4 @@ public class InsertColumnAction extends CellSelectionAction {
         }
         return true;
     }
-}
+}

designer-realize/src/main/java/com/fr/design/actions/columnrow/InsertRowAction.java

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.columnrow;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.CellSelectionAction;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -26,7 +26,7 @@ public class InsertRowAction extends CellSelectionAction {
 		super(t);
         this.setName(name);
         this.setMnemonic(INSERT_ROW.getMnemonic());
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/insertRow.png"));
+		this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_insert/insertRow_normal.svg"));
 	}
 
 	public static final MenuKeySet INSERT_ROW = new MenuKeySet() {
@@ -59,4 +59,4 @@ public class InsertRowAction extends CellSelectionAction {
 
 		return true;
 	}
-}
+}

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

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.edit;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.actions.ElementCaseAction;
 
 import com.fr.design.mainframe.ElementCasePane;
@@ -20,7 +20,7 @@ public class DeleteAction extends ElementCaseAction {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
         this.setMnemonic('D');
         //Richie:删除菜单图标
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_report/delete.png");
 //        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
     }
 

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

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.edit;
 
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.EastRegionContainerPane;
 import com.fr.design.menu.KeySetUtils;
@@ -19,7 +19,7 @@ public class HyperlinkAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.HYPER_LINK);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_insert/hyperLink.png"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_insert/hyperLink_normal.svg"));
     }
 
     @Override
@@ -27,4 +27,4 @@ public class HyperlinkAction extends UpdateAction {
         EastRegionContainerPane.getInstance().switchTabTo(EastRegionContainerPane.KEY_HYPERLINK);
         EastRegionContainerPane.getInstance().setWindow2PreferWidth();
     }
-}
+}

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

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.edit.merge;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.mainframe.ElementCasePane;
@@ -21,8 +21,7 @@ public class MergeCellAction extends ElementCaseAction  {
         this.setMenuKeySet(KeySetUtils.MERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/merge_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/m_edit/merge.png");
-		this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/merge_disabled.svg"));
 	}
 
     /**

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

@@ -3,8 +3,7 @@
  */
 package com.fr.design.actions.edit.merge;
 
-import com.fr.base.BaseUtils;
+
-import com.fr.base.svg.SVGIcon;
 import com.fr.design.actions.ElementCaseAction;
 import com.fr.design.menu.KeySetUtils;
 import com.fr.design.mainframe.ElementCasePane;
@@ -21,8 +20,7 @@ public class UnmergeCellAction extends ElementCaseAction {
         this.setMenuKeySet(KeySetUtils.UNMERGE_CELL);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/unmerge_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_edit/unmerge.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/unmerge_disabled.svg"));
     }
 
 	@Override

designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java

@@ -5,7 +5,8 @@ import java.awt.event.KeyEvent;
 
 import javax.swing.KeyStroke;
 
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JPolyWorkBook;
@@ -18,7 +19,7 @@ public class NewPolyReportAction extends UpdateAction {
     public NewPolyReportAction() {
         this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Multi_Report"));
         this.setMnemonic('F');
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/formExport_normal.svg"));
+        this.setSmallIcon(SVGIconUtils.readIcon("/com/fr/design/images/m_file/formExport_normal.svg"));
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER));
     }
 

designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java

@@ -1,6 +1,7 @@
 package com.fr.design.actions.file.newReport;
 
-import com.fr.base.svg.SVGIcon;
+
+import com.fr.base.svg.SVGIconUtils;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.mainframe.DesignerContext;
 import com.fr.design.mainframe.JWorkBook;
@@ -25,7 +26,7 @@ public class NewWorkBookAction extends UpdateAction {
     }
 
     protected Icon icon() {
-        return SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/newcpts_normal.svg");
+        return SVGIconUtils.readIcon("/com/fr/design/images/buttonicon/newcpts_normal.svg");
     }
 
     /**

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

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.menu.MenuKeySet;
@@ -30,8 +30,7 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor
         this.setMenuKeySet(INSERT_SLOPE_LINE);
         this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bias_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_insert/bias.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bias_disabled.svg"));
     }
 
     public static final MenuKeySet INSERT_SLOPE_LINE = new MenuKeySet() {

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

@@ -3,7 +3,7 @@
  */
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.mainframe.ElementCasePane;
@@ -29,8 +29,7 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo
 		this.setMenuKeySet(INSERT_CHART);
 		this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
 		this.setMnemonic(getMenuKeySet().getMnemonic());
-		this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/chart_normal.svg"));
+		this.setSmallIcon("/com/fr/design/images/m_insert/chart.png");
-		this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/chart_disabled.svg"));
 	}
 
 	public static final MenuKeySet INSERT_CHART = new MenuKeySet() {

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

@@ -1,6 +1,6 @@
 package com.fr.design.actions.insert.cell;
 
-import com.fr.base.svg.SVGIcon;
+
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.dscolumn.DSColumnPane;
 import com.fr.design.mainframe.ElementCasePane;
@@ -22,8 +22,7 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu
         this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bindColumn_normal.svg"));
+        this.setSmallIcon("/com/fr/design/images/m_insert/bindColumn.png");
-        this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_insert/bindColumn_disabled.svg"));
     }
 
     @Override