diff --git a/designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java index 29c4e9353e..799a657f8f 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/LocateAction.java +++ b/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 diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java index 17d7882c1a..645a31906d 100644 --- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java +++ b/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"); diff --git a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java index f0ec638292..b3a076a92b 100644 --- a/designer-base/src/main/java/com/fr/design/data/BasicTableDataTreePane.java +++ b/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 diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java index 09ddcfd642..8db517d614 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataCreatorProducer.java +++ b/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() { diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java index e220b9d01b..ed08cffddf 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTree.java +++ b/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 { 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; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index e451ac35d1..57ad09d0e7 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/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 diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java index da1d15b8fc..f5266c9b6d 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java +++ b/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() { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapperHelper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapperHelper.java index e6c566c7c8..45211c095f 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/MultiResultTableDataWrapperHelper.java +++ b/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, 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 { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java index 37fb2e702e..839275fa41 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/ServerTableDataWrapper.java +++ b/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"); } /** diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java index 5bc328477d..6c9af4827f 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureDataWrapper.java +++ b/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"); } /** diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java index 5c264c4da0..c2c815e8a8 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/StoreProcedureNameWrapper.java +++ b/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) { diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java index 090655997f..749f2b3ae4 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TableDataFactory.java +++ b/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"; } /** diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java b/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java index cf27a0dbcb..93bb7bf3bf 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/wrapper/TemplateTableDataWrapper.java +++ b/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)); } diff --git a/designer-base/src/main/java/com/fr/design/extra/exe/callback/handle/PluginTaskResultErrorDialog.java b/designer-base/src/main/java/com/fr/design/extra/exe/callback/handle/PluginTaskResultErrorDialog.java index da4f432080..5cc0dce953 100644 --- a/designer-base/src/main/java/com/fr/design/extra/exe/callback/handle/PluginTaskResultErrorDialog.java +++ b/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)); // 提示内容 diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java index 94995e0bcd..25099420fd 100644 --- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java +++ b/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")); diff --git a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java b/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java index 1837711cd1..627baf6b92 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icontainer/UIModeControlContainer.java +++ b/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("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Parameter_Panel") + "")); - 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); diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java index 4bea4e315f..194dfa82de 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java +++ b/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")); diff --git a/designer-base/src/main/java/com/fr/design/icon/IconPathConstants.java b/designer-base/src/main/java/com/fr/design/icon/IconPathConstants.java index b6d2426e22..8fa97cfd56 100644 --- a/designer-base/src/main/java/com/fr/design/icon/IconPathConstants.java +++ b/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"; diff --git a/designer-base/src/main/java/com/fr/design/icon/WarningIcon.java b/designer-base/src/main/java/com/fr/design/icon/WarningIcon.java index 3843100f43..6d28365722 100644 --- a/designer-base/src/main/java/com/fr/design/icon/WarningIcon.java +++ b/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); } /** diff --git a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java index 06e1fb1bb8..9019a30011 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/DesignerFrameFileDealerPane.java +++ b/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 diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java index 34ead60285..760df5c904 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java +++ b/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> } 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()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java index b113b9c997..64d58bd8e5 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/ToolBarNewTemplatePane.java +++ b/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 diff --git a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java b/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java index 67c57db987..1d09f24828 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/check/CheckButton.java +++ b/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); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java index 2786073a28..ee9b861b1e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/manager/search/searcher/control/pane/TemplateTreeSearchToolbarPane.java +++ b/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() { diff --git a/designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java b/designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java index a3553f2ca3..8e5c3ff404 100644 --- a/designer-base/src/main/java/com/fr/design/notification/ui/NotificationCenterPane.java +++ b/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")); } } diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java index 41cd758905..43d2fd9709 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWindow.java +++ b/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); diff --git a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java b/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java index 3cd6b78773..e41304e23b 100644 --- a/designer-base/src/main/java/com/fr/startup/ui/StartupPageWorkspacePanel.java +++ b/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 diff --git a/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.svg b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.svg deleted file mode 100644 index 8b3b40bbef..0000000000 --- a/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - icon_列表_文件_normal - - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/addicon/addicon.svg b/designer-base/src/main/resources/com/fr/design/standard/addicon/addicon_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/addicon/addicon.svg rename to designer-base/src/main/resources/com/fr/design/standard/addicon/addicon_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/alpha_fine.svg b/designer-base/src/main/resources/com/fr/design/standard/alpha_fine_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/alpha_fine.svg rename to designer-base/src/main/resources/com/fr/design/standard/alpha_fine_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/cell_default.svg b/designer-base/src/main/resources/com/fr/design/standard/cell_default_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/cell_default.svg rename to designer-base/src/main/resources/com/fr/design/standard/cell_default_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/class_table_data.svg b/designer-base/src/main/resources/com/fr/design/standard/class_table_data_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/class_table_data.svg rename to designer-base/src/main/resources/com/fr/design/standard/class_table_data_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/collapse-all.svg b/designer-base/src/main/resources/com/fr/design/standard/collapse_all_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/collapse-all.svg rename to designer-base/src/main/resources/com/fr/design/standard/collapse_all_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/data_table.svg b/designer-base/src/main/resources/com/fr/design/standard/data_table_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/data_table.svg rename to designer-base/src/main/resources/com/fr/design/standard/data_table_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/database.svg b/designer-base/src/main/resources/com/fr/design/standard/database_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/database.svg rename to designer-base/src/main/resources/com/fr/design/standard/database_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/dot_line.svg b/designer-base/src/main/resources/com/fr/design/standard/dot_line_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/dot_line.svg rename to designer-base/src/main/resources/com/fr/design/standard/dot_line_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/field.svg b/designer-base/src/main/resources/com/fr/design/standard/field_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/field.svg rename to designer-base/src/main/resources/com/fr/design/standard/field_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/file.svg b/designer-base/src/main/resources/com/fr/design/standard/file_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/file.svg rename to designer-base/src/main/resources/com/fr/design/standard/file_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cht_icon.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg rename to designer-base/src/main/resources/com/fr/design/standard/fileicon/cht_icon.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cpt_icon.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg rename to designer-base/src/main/resources/com/fr/design/standard/fileicon/cpt_icon.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_icon.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon.svg rename to designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_icon.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_icon_locked.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg rename to designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_icon_locked.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder_half_authority.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg rename to designer-base/src/main/resources/com/fr/design/standard/fileicon/folder_half_authority.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/frm_icon.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg rename to designer-base/src/main/resources/com/fr/design/standard/fileicon/frm_icon.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/font_miss_check.svg b/designer-base/src/main/resources/com/fr/design/standard/font_miss_check_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/font_miss_check.svg rename to designer-base/src/main/resources/com/fr/design/standard/font_miss_check_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/guide.svg b/designer-base/src/main/resources/com/fr/design/standard/guide_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/guide.svg rename to designer-base/src/main/resources/com/fr/design/standard/guide_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/locate.svg b/designer-base/src/main/resources/com/fr/design/standard/locate_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/locate.svg rename to designer-base/src/main/resources/com/fr/design/standard/locate_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/multi.svg b/designer-base/src/main/resources/com/fr/design/standard/multi_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/multi.svg rename to designer-base/src/main/resources/com/fr/design/standard/multi_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/noboder.svg b/designer-base/src/main/resources/com/fr/design/standard/noboder_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/noboder.svg rename to designer-base/src/main/resources/com/fr/design/standard/noboder_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/server_database.svg b/designer-base/src/main/resources/com/fr/design/standard/server_database_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/server_database.svg rename to designer-base/src/main/resources/com/fr/design/standard/server_database_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/store_procedure.svg b/designer-base/src/main/resources/com/fr/design/standard/store_procedure_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/store_procedure.svg rename to designer-base/src/main/resources/com/fr/design/standard/store_procedure_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/system/add.svg b/designer-base/src/main/resources/com/fr/design/standard/system/add_normal.svg old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/system/add.svg rename to designer-base/src/main/resources/com/fr/design/standard/system/add_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/system/cpt.svg b/designer-base/src/main/resources/com/fr/design/standard/system/cpt_normal.svg old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/system/cpt.svg rename to designer-base/src/main/resources/com/fr/design/standard/system/cpt_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/system/error_tips.svg b/designer-base/src/main/resources/com/fr/design/standard/system/error_tips_normal.svg old mode 100755 new mode 100644 similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/system/error_tips.svg rename to designer-base/src/main/resources/com/fr/design/standard/system/error_tips_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/template_theme.svg b/designer-base/src/main/resources/com/fr/design/standard/template_theme_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/template_theme.svg rename to designer-base/src/main/resources/com/fr/design/standard/template_theme_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/tree.svg b/designer-base/src/main/resources/com/fr/design/standard/tree_normal.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/tree.svg rename to designer-base/src/main/resources/com/fr/design/standard/tree_normal.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg b/designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg deleted file mode 100644 index 8a44f28058..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon 显示 - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/warning.svg b/designer-base/src/main/resources/com/fr/design/standard/warning.svg deleted file mode 100644 index aabba23e7d..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/warning.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java index 65744b9b65..7b7ec644d6 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java +++ b/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(); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java index 7893cfff41..da974e0b4a 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java +++ b/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()); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java index 736fdd87f9..b2b00482c6 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java +++ b/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); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java index 639a486973..c8c1b7172e 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java +++ b/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"); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java index 7b195e469e..55580d304e 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java +++ b/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); diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/guide/entry/GuideEntryPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/guide/entry/GuideEntryPane.java index 1495b564b4..5d4044aef6 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/guide/entry/GuideEntryPane.java +++ b/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);