REPORT-89253 命名和读取规范化处理,回退右下角异常小标记

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

@@ -28,7 +28,7 @@ public class LocateAction extends UpdateAction {
 
     public LocateAction() {
         this.setName(Toolkit.i18nText("Fine-Design_Basic_Locate"));
-        this.setSmallIcon("/com/fr/design/standard/locate.svg");
+        this.setSmallIcon("/com/fr/design/standard/locate", false);
     }
 
     @Override

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

@@ -4,7 +4,6 @@
 package com.fr.design.constants;
 
 import com.fr.base.svg.IconUtils;
-import com.fr.base.svg.SVGIcon;
 import com.fr.base.svg.SVGLoader;
 import com.fr.general.IOUtils;
 import com.fr.stable.Constants;
@@ -12,7 +11,6 @@ import com.fr.stable.StringUtils;
 
 import javax.swing.BorderFactory;
 import javax.swing.Icon;
-import javax.swing.ImageIcon;
 import javax.swing.border.Border;
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -57,7 +55,7 @@ public interface UIConstants {
      * Cell default cursor.
      */
     public static final Cursor CELL_DEFAULT_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor(
-            SVGLoader.load("/com/fr/design/standard/cell_default.svg"),
+            SVGLoader.load("/com/fr/design/standard/cell_default_normal.svg"),
             new Point(16, 16), "CellDefaultCursor");
     public static final Cursor DRAW_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor(
             IOUtils.readImage("/com/fr/base/images/cell/cursor/cursor_draw.png"),
@@ -171,7 +169,7 @@ public interface UIConstants {
     public static final Image DRAG_LEFT_NORMAL = SVGLoader.load("/com/fr/design/standard/drag/left_normal.svg");
     public static final Image DRAG_LEFT_PRESS = SVGLoader.load("/com/fr/design/standard/drag/left_pressed.svg");
     public static final BufferedImage DRAG_DOT = IOUtils.readImage("com/fr/design/images/control/dot.png");
-    public static final Image DRAG_LINE = SVGLoader.load("/com/fr/design/standard/dot_line.svg");
+    public static final Image DRAG_LINE = SVGLoader.load("/com/fr/design/standard/dot_line_normal.svg");
     public static final BufferedImage ACCESSIBLE_EDITOR_DOT = IOUtils.readImage("com/fr/design/images/control/dot.png");
     public static final BufferedImage DRAG_DOT_VERTICAL = IOUtils.readImage("com/fr/design/images/control/dotv.png");
     public static final BufferedImage POP_BUTTON_DOWN = IOUtils.readImage("com/fr/design/images/buttonicon/popdownarrow.png");
@@ -188,12 +186,12 @@ public interface UIConstants {
     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 = IconUtils.readIcon("com/fr/design/images/buttonicon/prewidget");
-    public static final Icon EDIT_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/edit_normal.svg");
-    public static final Icon EDIT_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/edit_pressed.svg");
-    public static final Icon HIDE_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/hide_normal.svg");
-    public static final Icon HIDE_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/hide_pressed.svg");
-    public static final Icon VIEW_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/view_normal.svg");
-    public static final Icon VIEW_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/view_pressed.svg");
+    public static final Icon EDIT_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/edit");
+    public static final Icon EDIT_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/edit");
+    public static final Icon HIDE_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/hide");
+    public static final Icon HIDE_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/hide");
+    public static final Icon VIEW_NORMAL_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/view");
+    //public static final Icon VIEW_PRESSED_ICON = IconUtils.readIcon("/com/fr/design/standard/uimode/view");
 
     public static final Icon RUN_BIG_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/run24.svg");
     public static final Icon RUN_SMALL_ICON = IconUtils.readIcon("/com/fr/design/standard/preview/runs.svg");

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

@@ -464,7 +464,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("/com/fr/design/standard/connection_normal.svg", false);
+            this.setSmallIcon("/com/fr/design/standard/connection", false);
         }
 
         @Override

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

@@ -33,33 +33,33 @@ public class TableDataCreatorProducer {
     public TableDataNameObjectCreator[] createReportTableDataCreator() {
         TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
                 "ds",
-                "/com/fr/design/standard/database.svg", DBTableData.class, DBTableDataPane.class);
+                "/com/fr/design/standard/database_normal.svg", DBTableData.class, DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
                 "Class",
-                "/com/fr/design/standard/class_table_data.svg", ClassTableData.class, ClassTableDataPane.class);
+                "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
                 "Embedded",
-                "/com/fr/design/standard/data_table.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class);
+                "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class);
         TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
                 "Multi",
-                "/com/fr/design/standard/multi.svg", ConditionTableData.class, MultiTDTableDataPane.class) {
+                "/com/fr/design/standard/multi_normal.svg", ConditionTableData.class, MultiTDTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
                 "File",
-                "/com/fr/design/standard/file.svg", FileTableData.class, FileTableDataSmallHeightPane.class);
+                "/com/fr/design/standard/file_normal.svg", FileTableData.class, FileTableDataSmallHeightPane.class);
         TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
                 "Tree",
-                "/com/fr/design/standard/tree.svg", RecursionTableData.class, TreeTableDataPane.class) {
+                "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Datasource_Stored_Procedure"),
                 "Proc",
-                "/com/fr/design/standard/store_procedure.svg",
+                "/com/fr/design/standard/store_procedure_normal.svg",
                 StoreProcedure.class, ProcedureDataPane.class) {
             @Override
             public boolean shouldInsertSeparator() {
@@ -72,33 +72,33 @@ public class TableDataCreatorProducer {
 
     public TableDataNameObjectCreator[] createServerTableDataCreator() {
         TableDataNameObjectCreator dataBase = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_DS_Database_Query"),
-                "/com/fr/design/standard/server_database.svg", DBTableData.class,
+                "/com/fr/design/standard/server_database_normal.svg", DBTableData.class,
                 DBTableDataPane.class);
         TableDataNameObjectCreator ds_Class = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Class"),
-                "/com/fr/design/standard/class_table_data.svg", ClassTableData.class,
+                "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class,
                 ClassTableDataPane.class);
         TableDataNameObjectCreator table = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Embedded"),
-                "/com/fr/design/standard/data_table.svg", EmbeddedTableData.class,
+                "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class,
                 EmbeddedTableDataPane.class);
         TableDataNameObjectCreator fileTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_File"),
-                "/com/fr/design/standard/file.svg", FileTableData.class,
+                "/com/fr/design/standard/file_normal.svg", FileTableData.class,
                 FileTableDataSmallPane.class);
         TableDataNameObjectCreator treeTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Tree"),
-                "/com/fr/design/standard/tree.svg",
+                "/com/fr/design/standard/tree_normal.svg",
                 RecursionTableData.class, GlobalTreeTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator multiTable = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Relation"),
-                "/com/fr/design/standard/multi.svg",
+                "/com/fr/design/standard/multi_normal.svg",
                 ConditionTableData.class, GlobalMultiTDTableDataPane.class) {
             public boolean isNeedParameterWhenPopulateJControlPane() {
                 return true;
             }
         };
         TableDataNameObjectCreator storeProcedure = new TableDataNameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tabledata_Type_Stored_Procedure"),
-                "/com/fr/design/standard/store_procedure.svg",
+                "/com/fr/design/standard/store_procedure_normal.svg",
                 StoreProcedure.class, ProcedureDataPane.class) {
             @Override
             public boolean shouldInsertSeparator() {

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

@@ -1,11 +1,9 @@
 package com.fr.design.data.datapane;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.svg.IconUtils;
 import com.fr.data.MultiResultTableData;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager;
-import com.fr.design.data.tabledata.wrapper.AbstractTableDataWrapper;
 import com.fr.design.data.tabledata.wrapper.TableDataWrapper;
 import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode;
 import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree;
@@ -56,7 +54,7 @@ public class TableDataTree extends UserObjectRefreshJTree<TableDataSourceOP> {
             Object userObj = treeNode.getUserObject();
             if (userObj instanceof String) {
                 // p:这个是column field.
-                this.setIcon(IconUtils.readIcon("/com/fr/design/standard/field.svg"));
+                this.setIcon(IconUtils.readIcon("/com/fr/design/standard/field"));
                 this.setText((String) userObj);
             } else if (userObj instanceof NameObject) {
                 NameObject nameObject = (NameObject) userObj;

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

@@ -1227,7 +1227,7 @@ public class TableDataTreePane extends BasicTableDataTreePane {
         public SwitchAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Search"));
             this.setMnemonic('S');
-            this.setSmallIcon("/com/fr/design/standard/search_normal.svg", false);
+            this.setSmallIcon("/com/fr/design/standard/search", false);
         }
 
         @Override

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

@@ -103,7 +103,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha
         searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
         searchPane.setBackground(Color.WHITE);
         // 左侧搜索图标
-        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search_normal.svg"));
+        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search"));
         searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
         searchLabel.addMouseListener(new MouseAdapter() {
             @Override
@@ -149,7 +149,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha
         });
         this.searchTextField.addKeyListener(enterPressed);
         // 右侧返回图标
-        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear_normal.svg"));
+        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear"));
         returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return"));
         returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11));
         returnLabel.addMouseListener(new MouseAdapter() {

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapperHelper.java

@@ -9,7 +9,6 @@ import com.fr.design.fun.TableDataDefineProvider;
 import com.fr.event.Event;
 import com.fr.event.EventDispatcher;
 import com.fr.event.Listener;
-import com.fr.general.IOUtils;
 import com.fr.plugin.context.PluginContext;
 import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.Filter;
@@ -26,7 +25,7 @@ import java.util.Map;
  */
 class MultiResultTableDataWrapperHelper {
     private static final Map<Class<? extends TableData>, Icon> TABLE_DATA_ICON_PATHS = new HashMap<>();
-    private static final String DEFAULT_MULTI_RESULT_TD_ICON = "/com/fr/design/standard/multi.svg";
+    private static final String DEFAULT_MULTI_RESULT_TD_ICON = "/com/fr/design/standard/multi";
 
 
     static {

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java

@@ -26,20 +26,22 @@ public final class ServerTableDataWrapper extends AbstractTableDataWrapper {
 	@Override
 	public Icon getIcon() {
 		if (tabledata instanceof DBTableData) {
-			if (StringUtils.isBlank(((DBTableData) tabledata).getQuery()))
-				return new WarningIcon(SVGLoader.load("/com/fr/design/standard/server_database.svg"));
-			else
-				return IconUtils.readIcon("/com/fr/design/standard/server_database.svg");
+			if (StringUtils.isBlank(((DBTableData) tabledata).getQuery())) {
+				return new WarningIcon(BaseUtils.readImage("/com/fr/design/images/gui/warning.png"));
+			}
+			else {
+				return IconUtils.readIcon("/com/fr/design/standard/server_database");
+			}
 		} else if (tabledata instanceof ClassTableData) {
-			return IconUtils.readIcon("/com/fr/design/standard/class_table_data.svg");
+			return IconUtils.readIcon("/com/fr/design/standard/class_table_data");
 		} else if (tabledata instanceof EmbeddedTableData) {
-			return IconUtils.readIcon("/com/fr/design/standard/data_table.svg");
+			return IconUtils.readIcon("/com/fr/design/standard/data_table");
 		}else if(tabledata instanceof RecursionTableData){
-			return IconUtils.readIcon("/com/fr/design/standard/tree.svg");
+			return IconUtils.readIcon("/com/fr/design/standard/tree");
 		} else if (tabledata instanceof StoreProcedure) {
-            return IconUtils.readIcon("/com/fr/design/standard/store_procedure.svg");
+            return IconUtils.readIcon("/com/fr/design/standard/store_procedure");
         }
-		return IconUtils.readIcon("/com/fr/design/standard/server_database.svg");
+		return IconUtils.readIcon("/com/fr/design/standard/server_database");
 	}
 
     /**

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java

@@ -1,6 +1,5 @@
 package com.fr.design.data.tabledata.wrapper;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
 import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
@@ -151,7 +150,7 @@ public final class StoreProcedureDataWrapper implements TableDataWrapper {
 
     @Override
     public Icon getIcon() {
-        return IconUtils.readIcon("/com/fr/design/standard/store_procedure.svg");
+        return IconUtils.readIcon("/com/fr/design/standard/store_procedure");
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java

@@ -1,6 +1,5 @@
 package com.fr.design.data.tabledata.wrapper;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
 import com.fr.base.svg.IconUtils;
 import com.fr.data.impl.storeproc.ProcedureDataModel;
@@ -72,7 +71,7 @@ public final class StoreProcedureNameWrapper implements TableDataWrapper {
 
     @Override
     public Icon getIcon() {
-        return IconUtils.readIcon("/com/fr/design/standard/store_procedure.svg");
+        return IconUtils.readIcon("/com/fr/design/standard/store_procedure");
     }
 
     private void createStore(boolean needLoadingBar) {

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java

@@ -55,15 +55,15 @@ public abstract class TableDataFactory {
      * 同一类型的只能加一次,就加最上层的类,因为要排序。如果将所有的 FileTableData都加进来，那么FileTableData的排序就不正确了
      */
     static {
-        defaultMap.put(DBTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database.svg", DBTableData.class, DBTableDataPane.class));
-        defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/class_table_data.svg", ClassTableData.class, ClassTableDataPane.class));
-        defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/data_table.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class));
-        defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi.svg", DecoratedTableData.class, DecoratedTableDataPane.class));
+        defaultMap.put(DBTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database_normal.svg", DBTableData.class, DBTableDataPane.class));
+        defaultMap.put(ClassTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/class_table_data_normal.svg", ClassTableData.class, ClassTableDataPane.class));
+        defaultMap.put(EmbeddedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/data_table_normal.svg", EmbeddedTableData.class, EmbeddedTableDataPane.class));
+        defaultMap.put(DecoratedTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", DecoratedTableData.class, DecoratedTableDataPane.class));
         defaultMap.put(StoreProcedure.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/images/data/store_procedure.png", StoreProcedure.class, ProcedureDataPane.class));
-        defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi.svg", MultiTDTableData.class, MultiTDTableDataPane.class));
-        defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/file.svg", FileTableData.class, FileTableDataPane.class));
-        defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/tree.svg", RecursionTableData.class, TreeTableDataPane.class));
-        defaultMap.put(MultiFieldTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database.svg", MultiFieldTableData.class, null));
+        defaultMap.put(MultiTDTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/multi_normal.svg", MultiTDTableData.class, MultiTDTableDataPane.class));
+        defaultMap.put(FileTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/file_normal.svg", FileTableData.class, FileTableDataPane.class));
+        defaultMap.put(RecursionTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/tree_normal.svg", RecursionTableData.class, TreeTableDataPane.class));
+        defaultMap.put(MultiFieldTableData.class.getName(), new TableDataNameObjectCreator(null, "/com/fr/design/standard/database_normal.svg", MultiFieldTableData.class, null));
         map.putAll(defaultMap);
     }
 
@@ -151,7 +151,7 @@ public abstract class TableDataFactory {
         if (tableDataNameObjectCreator != null && tableDataNameObjectCreator.getIconPath() != null) {
             return tableDataNameObjectCreator.getIconPath();
         }
-        return "/com/fr/design/standard/database.svg";
+        return "/com/fr/design/standard/database_normal.svg";
     }
 
     /**

designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java

@@ -2,7 +2,6 @@ package com.fr.design.data.tabledata.wrapper;
 
 import javax.swing.Icon;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.TableData;
 import com.fr.base.svg.IconUtils;
 import com.fr.base.svg.SVGLoader;
@@ -22,7 +21,7 @@ public final class TemplateTableDataWrapper extends AbstractTableDataWrapper {
 	@Override
 	public Icon getIcon() {
 		if (tabledata instanceof DBTableData && StringUtils.isBlank(((DBTableData) tabledata).getQuery())) {
-			return new WarningIcon(SVGLoader.load("/com/fr/design/standard/database.svg"));
+			return new WarningIcon(SVGLoader.load("/com/fr/design/standard/database_normal.svg"));
 		}
 		return IconUtils.readIcon(TableDataFactory.getIconPath(tabledata));
 	}

designer-base/src/main/java/com/fr/design/extra/exe/callback/handle/PluginTaskResultErrorDialog.java

@@ -53,7 +53,7 @@ public class PluginTaskResultErrorDialog extends JDialog {
     private void initContentPane() {
         this.contentPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         // error图标
-        errorLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/error_tips.svg"));
+        errorLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/error_tips"));
         errorLabel.setPreferredSize(LABEL);
         errorLabel.setBorder(BorderFactory.createEmptyBorder(10, 20, 40, 20));
         // 提示内容

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

@@ -86,10 +86,10 @@ import static javax.swing.JOptionPane.WARNING_MESSAGE;
  **/
 public class MultiTemplateTabPane extends JComponent {
 
-    private static Icon LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_normal.svg");
+    private static Icon LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list");
     private static Icon MOUSE_OVER_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg");
     private static Icon MOUSE_PRESS_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg");
-    private static Icon CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_normal.svg");
+    private static Icon CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close");
     private static Icon MOUSE_OVER_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_mouseover.svg");
     private static Icon MOUSE_PRESS_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_press.svg");
     private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/white_saving_close.gif"));

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

@@ -282,7 +282,7 @@ public class UIModeControlContainer extends JLayeredPane {
             setLayout(new FlowLayout(FlowLayout.CENTER, 10, -3));
             setBackground(UIConstants.NORMAL_BACKGROUND);
             add(new UILabel("<html><font size='5' face='Microsoft YaHei' color='#999999999'><B>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Panel") + "</B></font></html>"));
-            UIButton viewButton = new UIButton(UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_PRESSED_ICON, UIConstants.VIEW_PRESSED_ICON) {
+            UIButton viewButton = new UIButton(UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_NORMAL_ICON, UIConstants.VIEW_NORMAL_ICON) {
                 @Override
                 public Dimension getPreferredSize() {
                     return new Dimension(32, 32);

designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java

@@ -27,7 +27,7 @@ public class FileTreeIcon {
 
     public static final Icon FOLDER_IMAGE_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/folder.svg");
     public static final Icon FOLDER_HALF_IMAGE_ICON =
-            IconUtils.readIcon("/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/folder_half_authority.svg");
 
     public static final Icon FILE_IMAGE_ICON = UIManager.getIcon("FileView.fileIcon");
 
@@ -46,14 +46,14 @@ public class FileTreeIcon {
     public static final Icon CHT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cht.png");
 
     public static final Icon MODERN_CPT_FILE_IMAGE_ICON =
-            IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/cpt_icon.svg");
     public static final Icon MODERN_FRM_FILE_IMAGE_ICON =
-            IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/frm_icon.svg");
     public static final Icon MODERN_CHT_FILE_IMAGE_ICON =
-            IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg");
+            IconUtils.readIcon("/com/fr/design/standard/fileicon/cht_icon.svg");
 
-    public static final Icon CPTX_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_file_icon.svg");
-    public static final Icon CPTX_LOCKED_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg");
+    public static final Icon CPTX_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_icon.svg");
+    public static final Icon CPTX_LOCKED_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_icon_locked.svg");
 
     public static final LockIcon FOLDER_LOCK_ICON =
             new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/fold.png"));

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

@@ -15,21 +15,21 @@ public class IconPathConstants {
 
     public static final String ADD_POPMENU_ICON_PATH = "/com/fr/design/images/control/addPopup.png";
 
-    public static final String DS_ICON_PATH = "/com/fr/design/standard/server_database.svg";
+    public static final String DS_ICON_PATH = "/com/fr/design/standard/server_database";
     public static final String CLASS_TD_ICON_PATH = "/com/fr/design/images/data/source/classTableData.png";
     public static final String EMB_TD_ICON_PATH = "/com/fr/design/images/data/dataTable.png";
     public static final String DS_RELATION_TD_ICON_PATH = "/com/fr/design/images/data/multi.png";
     public static final String FILE_TD_ICON_PATH = "/com/fr/design/images/data/file.png";
     public static final String DS_TREE_TD_ICON_PATH = "/com/fr/design/images/data/tree.png";
-    public static final String DS_QUERY_ICON_PATH = "/com/fr/design/standard/database.svg";
+    public static final String DS_QUERY_ICON_PATH = "/com/fr/design/standard/database";
     public static final String PREVIEW_ICON_PATH = "/com/fr/design/images/m_file/preview.png";
     public static final String TD_EDIT_ICON_PATH = "/com/fr/design/images/control/edit.png";
     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/remove.png";
     public static final String TD_CONNECTION_ICON_PATH = "/com/fr/design/images/m_web/connection.png";
-    public static final String SP_SHOW_ICON_PATH = "/com/fr/design/standard/store_procedure.svg";
-    public static final String STD_SHOW_ICON_PATH = "/com/fr/design/standard/server_database.svg";
+    public static final String SP_SHOW_ICON_PATH = "/com/fr/design/standard/store_procedure";
+    public static final String STD_SHOW_ICON_PATH = "/com/fr/design/standard/server_database";
     public static final String XMLA_ICON_PATH = "/com/fr/design/images/data/cube.png";
     public static final String FORBID_ICON_PATH = "/com/fr/web/images/form/forbid.png";
     public static final String EDIT_ICON_PATH = "/com/fr/design/images/control/newEdit.png";

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

@@ -1,8 +1,6 @@
 package com.fr.design.icon;
 
 import com.fr.base.BaseUtils;
-import com.fr.base.svg.SVGLoader;
-import com.fr.design.utils.SvgPaintUtils;
 import com.fr.log.FineLoggerFactory;
 
 import javax.swing.GrayFilter;
@@ -20,9 +18,7 @@ public class WarningIcon extends ImageIcon {
 	protected final static Component component = new Component() {
 	};
 	protected final static MediaTracker tracker = new MediaTracker(component);
-	private final static Image warnighImage = SVGLoader.load("/com/fr/design/standard/warning.svg");
-	private final static int WARNING_DEFAULT_OFFSET_X = 8;
-	private final static int WARNING_DEFAULT_OFFSET_Y = 8;
+	private final static Image warnighImage = BaseUtils.readImage("/com/fr/design/images/gui/warning.png");
 
 	private Image mainImage = null;
 	private ImageObserver imageObserver;
@@ -39,16 +35,12 @@ public class WarningIcon extends ImageIcon {
 
 	@Override
 	public synchronized void paintIcon(Component c, Graphics g, int x, int y) {
-		SvgPaintUtils.beforePaint((Graphics2D) g);
 		if (mainImage != null) {
 			g.drawImage(mainImage, x, y, c);
 		}
 		if (warnighImage != null) {
-			int widthOffset = mainImage == null ? WARNING_DEFAULT_OFFSET_X : mainImage.getWidth(imageObserver) / 2;
-			int heightOffset = mainImage == null ? WARNING_DEFAULT_OFFSET_Y : mainImage.getHeight(imageObserver) / 2;
-			g.drawImage(warnighImage, x + widthOffset, y + heightOffset, c);
+			g.drawImage(warnighImage, x, y, c);
 		}
-		SvgPaintUtils.beforePaint((Graphics2D) g);
 	}
 
 	/**

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

@@ -469,7 +469,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         public CollapseAllAction() {
             this.setName(Toolkit.i18nText("Fine-Design_Basic_Collapse_All"));
-            this.setSmallIcon("/com/fr/design/standard/collapse-all.svg");
+            this.setSmallIcon("/com/fr/design/standard/collapse_all", false);
         }
 
         @Override

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

@@ -73,7 +73,6 @@ import com.fr.file.StashedFILE;
 import com.fr.form.ui.NoneWidget;
 import com.fr.form.ui.Widget;
 import com.fr.general.ComparatorUtils;
-import com.fr.general.IOUtils;
 import com.fr.locale.InterProviderFactory;
 import com.fr.log.FineLoggerFactory;
 import com.fr.nx.app.designer.toolbar.TemplateTransformer;
@@ -1574,7 +1573,7 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
     }
 
     protected UIButton createTemplateThemeButton() {
-        UIButton button = new UIButton(IconUtils.readIcon("/com/fr/design/standard/template_theme.svg")) {
+        UIButton button = new UIButton(IconUtils.readIcon("/com/fr/design/standard/template_theme")) {
             @Override
             public Dimension getPreferredSize() {
                 FontMetrics metrics = getFontMetrics(getFont());

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

@@ -1,6 +1,5 @@
 package com.fr.design.mainframe;
 
-import com.fr.base.BaseUtils;
 import com.fr.base.svg.IconUtils;
 import com.fr.design.file.NewTemplatePane;
 
@@ -22,7 +21,7 @@ public class ToolBarNewTemplatePane extends NewTemplatePane {
 
     @Override
     public Icon getNew() {
-        return IconUtils.readIcon("/com/fr/design/standard/addicon/addicon.svg");
+        return IconUtils.readIcon("/com/fr/design/standard/addicon/addicon");
     }
 
     @Override

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

@@ -45,7 +45,7 @@ public class CheckButton extends UIButton {
     private UILabel imageLabel;
 
     public CheckButton() {
-        this.setIcon(IconUtils.readIcon("/com/fr/design/standard/font_miss_check.svg"));
+        this.setIcon(IconUtils.readIcon("/com/fr/design/standard/font_miss_check"));
         this.setToolTipText(Toolkit.i18nText("Fine_Designer_Check_Font"));
         this.set4ToolbarButton();
         this.addActionListener(checkListener);

designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java

@@ -107,7 +107,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS
         searchPane.setBorder(BorderFactory.createLineBorder(UIConstants.TOOLBAR_BORDER_COLOR));
         searchPane.setBackground(Color.WHITE);
         // 左侧搜索图标
-        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search_normal.svg"));
+        UILabel searchLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/search"));
         searchLabel.setBorder(BorderFactory.createEmptyBorder(0, 12, 0, 0));
         searchLabel.addMouseListener(new MouseAdapter() {
             @Override
@@ -118,7 +118,7 @@ public class TemplateTreeSearchToolbarPane extends JPanel implements TreeSearchS
         // 中间输入框
         initSearchTextField();
         // 右侧返回图标
-        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear_normal.svg"));
+        UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear"));
         returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return"));
         returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11));
         returnLabel.addMouseListener(new MouseAdapter() {

designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java

@@ -21,7 +21,7 @@ public class NotificationCenterPane extends BasicPane {
         setPreferredSize(new Dimension(24, 24));
         setLayout(new BorderLayout());
         notificationCenterButton = new UIButton();
-        notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification_normal.svg"));
+        notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification"));
         notificationCenterButton.setToolTipText(Toolkit.i18nText("Fine-Design_Basic_Show_Notification"));
         notificationCenterButton.set4ToolbarButton();
         notificationCenterButton.setRolloverEnabled(false);
@@ -44,7 +44,7 @@ public class NotificationCenterPane extends BasicPane {
         if (NotificationCenter.getInstance().getNotificationsCount() > 0) {
             notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification_dot.svg"));
         } else {
-            notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification_normal.svg"));
+            notificationCenterButton.setIcon(IconUtils.readIcon("/com/fr/design/standard/notification/notification"));
         }
     }
 

designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java

@@ -363,7 +363,7 @@ public class StartupPageWindow extends JFrame {
                 for (String recentFile : recentFiles) {
                     JPanel recentItemPanel = new JPanel();
                     recentItemPanel.setLayout(new FlowLayout(FlowLayout.LEFT, ITEM_VERTICAL_GAP, 0));
-                    recentItemPanel.add(new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/cpt.svg")));
+                    recentItemPanel.add(new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/cpt")));
                     UILabel recentFileLabel = new UILabel(recentFile);
                     Color recentFileLabelForeground = recentFileLabel.getForeground();
                     recentItemPanel.add(recentFileLabel);

designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java

@@ -525,7 +525,7 @@ public class StartupPageWorkspacePanel extends JPanel {
         selectAndCreatePanel.setBorder(new EmptyBorder(0, 0, 0, 0));
         selectAndCreatePanel.setLayout(new BorderLayout());
         {
-            UILabel label = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/add.svg"));
+            UILabel label = new UILabel(IconUtils.readIcon("/com/fr/design/standard/system/add"));
             label.setPreferredSize(new Dimension(ARC_DIAMETER, ARC_DIAMETER));
             label.setForeground(HOVER_COLOR);
             selectAndCreatePanel.add(label, BorderLayout.CENTER);
@@ -540,7 +540,7 @@ public class StartupPageWorkspacePanel extends JPanel {
                 @Override
                 public void mouseExited(MouseEvent e) {
                     borderColorRef.set(null);
-                    label.setIcon(IconUtils.readIcon("/com/fr/design/standard/system/add.svg"));
+                    label.setIcon(IconUtils.readIcon("/com/fr/design/standard/system/add"));
                     repaintAll();
                 }
                 @Override

designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.svg

@@ -1,8 +0,0 @@
-<?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="M10,1 L14,5.001 L14,15 L2,15 L2,1 L10,1 Z M9,2 L3,2 L3,14 L13,14 L13,6.0002 L9,6.0002 L9,2 Z M10,2.414 L10,5 L12.586,5 L10,2.414 Z" id="Combined-Shape" fill="#333334"></path>
-        <path d="M4,13 L4,3 L8,3 L8,7 L12,7 L12,13 L4,13 Z" id="Combined-Shape" fill="#FEFBDE"></path>
-    </g>
-</svg>

designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="24px" height="24px" 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="M8,3 C10.9455187,3 13.6121853,4.6 16,7.8 C13.6121853,11 10.9455187,12.6 8,12.6 C5.05448133,12.6 2.38781467,11 0,7.8 C2.38781467,4.6 5.05448133,3 8,3 Z M8,4.6 C6.2326888,4.6 4.8,6.0326888 4.8,7.8 C4.8,9.5673112 6.2326888,11 8,11 C9.7673112,11 11.2,9.5673112 11.2,7.8 C11.2,6.0326888 9.7673112,4.6 8,4.6 Z M8,6.2 C8.8836556,6.2 9.6,6.9163444 9.6,7.8 C9.6,8.6836556 8.8836556,9.4 8,9.4 C7.1163444,9.4 6.4,8.6836556 6.4,7.8 C6.4,6.9163444 7.1163444,6.2 8,6.2 Z" id="形状结合" fill="#484848"></path>
-    </g>
-</svg>

designer-base/src/main/resources/com/fr/design/standard/warning.svg

@@ -1,9 +0,0 @@
-<svg width="12" height="12" viewBox="0 0 48 48" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M4.70611 45C1.40411 45 0.0541074 42.646 1.70511 39.771L20.9981 6.157C22.6491 3.281 25.3511 3.281 27.0011 6.157L46.2951 39.771C47.9461 42.646 46.5961 45 43.2941 45H4.70611Z" fill="#FBB03B"/>
-<mask id="mask0_112_11333" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="1" y="4" width="46" height="41">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M1 45H47V4H1V45Z" fill="white"/>
-</mask>
-<g mask="url(#mask0_112_11333)">
-<path fill-rule="evenodd" clip-rule="evenodd" d="M22 39H26V35H22V39ZM27 17L26 33H22L21 17H27Z" fill="white"/>
-</g>
-</svg>

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

@@ -60,7 +60,7 @@ public class BorderAction extends ElementCaseAction implements ChangeListener {
     public JComponent createToolBarComponent() {
         Object object = this.getValue(UIToolbarBorderButton.class.getName());
         if (object == null || !(object instanceof UIToolbarBorderButton)) {
-            UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(IconUtils.readIcon("/com/fr/design/standard/noboder.svg"), this.getEditingComponent());
+            UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(IconUtils.readIcon("/com/fr/design/standard/noboder"), this.getEditingComponent());
             this.putValue(UIToolbarBorderButton.class.getName(), borderStylePane);
             borderStylePane.setEnabled(this.isEnabled());
             borderStylePane.set4Toolbar();

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

@@ -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(IconUtils.readIcon("/com/fr/design/standard/foreground_normal.svg"));
+			UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/standard/foreground"));
 			this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 			tbButton.set4Toolbar();
 			tbButton.setEnabled(this.isEnabled());

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

@@ -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(IconUtils.readIcon("com/fr/design/standard/background_normal.svg"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("com/fr/design/standard/background"));
                 tbButton.set4Toolbar();
                 this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 

designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java

@@ -65,7 +65,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse
     private static final Icon ADD_WORK_SHEET = IconUtils.readIcon("/com/fr/design/standard/add_worksheet");
     protected static final Icon ADD_POLY_SHEET = IconUtils.readIcon("/com/fr/design/standard/add_polysheet");
     private static final Icon WORK_SHEET_ICON = IconUtils.readIcon("/com/fr/design/standard/worksheet");
-    private static final Icon POLY_SHEET_ICON = IconUtils.readIcon("/com/fr/design/standard/polysheet_normal.svg");
+    private static final Icon POLY_SHEET_ICON = IconUtils.readIcon("/com/fr/design/standard/polysheet");
     private static final Icon LEFT_ICON = IconUtils.readIcon("/com/fr/design/standard/prepage/pre_page");
     private static final Icon RIGHT_ICON = IconUtils.readIcon("/com/fr/design/standard/nextpage");
     private static final Icon DISABLED_LEFT_ICON = IconUtils.readIcon("/com/fr/design/standard/prepage/pre_page_disabled.svg");

designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java

@@ -31,7 +31,7 @@ public class AlphaFinePane extends BasicPane {
         setPreferredSize(new Dimension(24, 24));
         setLayout(new BorderLayout());
         UIButton refreshButton = new UIButton();
-        refreshButton.setIcon(IconUtils.readIcon(("/com/fr/design/standard/smallsearch_normal.svg")));
+        refreshButton.setIcon(IconUtils.readIcon(("/com/fr/design/standard/smallsearch")));
         refreshButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_Learn_More_About"));
         refreshButton.set4ToolbarButton();
         refreshButton.setRolloverEnabled(false);

designer-realize/src/main/java/com/fr/design/mainframe/guide/entry/GuideEntryPane.java

@@ -7,7 +7,6 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.mainframe.guide.collect.GuideCollector;
 import com.fr.design.mainframe.guide.ui.GuideManageDialog;
-import com.fr.general.IOUtils;
 
 import javax.swing.event.AncestorEvent;
 import javax.swing.event.AncestorListener;
@@ -36,7 +35,7 @@ public class GuideEntryPane extends BasicPane {
         setPreferredSize(new Dimension(24, 24));
         setLayout(new BorderLayout());
         button = new UIButton();
-        button.setIcon(IconUtils.readIcon("com/fr/design/standard/guide.svg"));
+        button.setIcon(IconUtils.readIcon("com/fr/design/standard/guide"));
         button.setToolTipText(Toolkit.i18nText(Toolkit.i18nText("Fine-Design_Guide_Entry_Name")));
         button.set4ToolbarButton();
         button.setRolloverEnabled(false);