diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java index e4957b9bdb..757bf62c6b 100644 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java +++ b/designer-base/src/main/java/com/fine/theme/light/ui/FineLightIconSet.java @@ -29,22 +29,48 @@ public class FineLightIconSet extends AbstractIconSet { new SvgIconSource("version_save", "com/fine/theme/icon/version_save.svg", true), new SvgIconSource("font_miss_check", "com/fine/theme/icon/font_miss_check.svg", true), new SvgIconSource("template_theme", "com/fine/theme/icon/template_theme.svg", true), - new SvgIconSource("database", "com/fr/design/standard/database.svg", true), - new SvgIconSource("preview", "com/fr/design/standard/previewdateset/preview.svg", false), - new SvgIconSource("connection", "com/fr/design/standard/connection.svg", true), - new SvgIconSource("class_table_data", "com/fr/design/standard/class_table_data.svg", true), - new SvgIconSource("data_table", "com/fr/design/standard/data_table.svg", true), - new SvgIconSource("multi", "com/fr/design/standard/multi.svg", true), - new SvgIconSource("file", "com/fr/design/standard/file.svg", true), - new SvgIconSource("tree", "com/fr/design/standard/tree.svg", true), - new SvgIconSource("store_procedure", "/com/fr/design/standard/store_procedure.svg", true), - new SvgIconSource("batch_esd_on", "com/fr/design/standard/batchesdon/batch_esd_on.svg", true), - new SvgIconSource("batch_esd_off", "com/fr/design/standard/batchesdoff/batch_esd_off.svg", true), - new SvgIconSource("edit", "com/fr/design/standard/editdataset/edit.svg", true), - new SvgIconSource("remove", "com/fr/design/standard/remove/remove.svg", true), - new SvgIconSource("search", "/com/fr/design/standard/search.svg", true), - new SvgIconSource("server_database", "com/fr/design/standard/server_database.svg", true), - new SvgIconSource("field", "com/fr/design/standard/field.svg", true) - ); + new SvgIconSource("remove", "com/fine/theme/icon/remove.svg", true), + new SvgIconSource("search", "com/fine/theme/icon/search.svg", true), + + // 数据集相关Icon + new SvgIconSource("database", "com/fine/theme/icon/dataset/database.svg", true), + new SvgIconSource("preview", "com/fine/theme/icon/dataset/preview.svg", false), + new SvgIconSource("connection", "com/fine/theme/icon/dataset/connection.svg", true), + new SvgIconSource("class_table_data", "com/fine/theme/icon/dataset/class_table_data.svg", true), + new SvgIconSource("data_table", "com/fine/theme/icon/dataset/data_table.svg", true), + new SvgIconSource("multi", "com/fine/theme/icon/dataset/multi.svg", true), + new SvgIconSource("file", "com/fine/theme/icon/dataset/file.svg", true), + new SvgIconSource("tree", "com/fine/theme/icon/dataset/tree.svg", true), + new SvgIconSource("store_procedure", "com/fine/theme/icon/dataset/store_procedure.svg", true), + new SvgIconSource("batch_esd_on", "com/fine/theme/icon/dataset/batch_esd_on.svg", true), + new SvgIconSource("batch_esd_off", "com/fine/theme/icon/dataset/batch_esd_off.svg", true), + new SvgIconSource("edit", "com/fine/theme/icon/dataset/edit.svg", true), + new SvgIconSource("server_database", "com/fine/theme/icon/dataset/server_database.svg", true), + new SvgIconSource("field", "com/fine/theme/icon/dataset/field.svg", true), + + // 目录树相关Icon + new SvgIconSource("folder", "com/fine/theme/icon/filetree/folder.svg", true), + new SvgIconSource("folder_open", "com/fine/theme/icon/filetree/folder_open.svg", true), + new SvgIconSource("cpt_icon", "com/fine/theme/icon/filetree/cpt_icon.svg", true), + new SvgIconSource("frm_icon", "com/fine/theme/icon/filetree/frm_icon.svg", true), + new SvgIconSource("fvs_icon", "com/fine/theme/icon/filetree/fvs_icon.svg", true), + new SvgIconSource("excel_icon", "com/fine/theme/icon/filetree/excel_icon.svg", true), + new SvgIconSource("minus", "com/fine/theme/icon/filetree/minus.svg", true), + new SvgIconSource("plus", "com/fine/theme/icon/filetree/plus.svg", true), + new SvgIconSource("locate", "com/fine/theme/icon/filetree/locate.svg", true), + new SvgIconSource("rename", "com/fine/theme/icon/filetree/rename.svg", true), + new SvgIconSource("collapse_all", "com/fine/theme/icon/filetree/collapse_all.svg", true), + new SvgIconSource("vcs_list", "com/fine/theme/icon/filetree/vcs_list.svg", true), + new SvgIconSource("view_folder", "com/fine/theme/icon/filetree/view_folder.svg", true), + new SvgIconSource("refresh", "com/fine/theme/icon/filetree/refresh.svg", true), + new SvgIconSource("new_folder", "com/fine/theme/icon/filetree/new_folder.svg", true), + + // CheckBox相关Icon + new SvgIconSource("checkbox_checked", "com/fine/theme/icon/checkbox/checked.svg", true), + new SvgIconSource("checkbox_unchecked", "com/fine/theme/icon/checkbox/unchecked.svg", true), + new SvgIconSource("checkbox_part_checked", "com/fine/theme/icon/checkbox/part_checked.svg", true), + new SvgIconSource("checkbox_hovered", "com/fine/theme/icon/checkbox/hovered.svg", true) + + ); } } 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 0c039b4af7..44275bedf3 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 @@ -1,5 +1,6 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.file.TemplateTreePane; @@ -28,7 +29,7 @@ public class LocateAction extends UpdateAction { public LocateAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Locate")); - this.setSmallIcon("/com/fr/design/standard/locate/locate"); + this.setSmallIcon(new LazyIcon("locate")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java b/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java index 842292ce2a..5bdc941cf4 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/RenameAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.chartx.TwoTuple; import com.fr.design.DesignerEnvManager; @@ -62,7 +63,7 @@ public class RenameAction extends UpdateAction { public RenameAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Rename")); - this.setSmallIcon("/com/fr/design/standard/rename/rename"); + this.setSmallIcon(new LazyIcon("rename")); } @Override 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 cc267aceff..ca7cb38b4b 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 @@ -5,13 +5,13 @@ import com.fr.base.svg.IconUtils; import com.fr.data.MultiResultTableData; import com.fr.design.data.datapane.management.search.TableDataTreeSearchManager; import com.fr.design.data.tabledata.wrapper.TableDataWrapper; +import com.fr.design.gui.itree.filetree.FineTreeCellRender; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.gui.itree.refreshabletree.UserObjectRefreshJTree; import com.fr.design.icon.IconPathConstants; import com.fr.general.ComparatorUtils; import com.fr.general.NameObject; -import javax.swing.BorderFactory; import javax.swing.JTree; import javax.swing.tree.DefaultMutableTreeNode; import javax.swing.tree.DefaultTreeCellRenderer; @@ -43,7 +43,7 @@ public class TableDataTree extends UserObjectRefreshJTree { } // CellRenderer - private DefaultTreeCellRenderer tableDataTreeCellRenderer = new DefaultTreeCellRenderer() { + private DefaultTreeCellRenderer tableDataTreeCellRenderer = new FineTreeCellRender() { private static final long serialVersionUID = 1L; @Override @@ -77,10 +77,6 @@ public class TableDataTree extends UserObjectRefreshJTree { this.setIcon(null); this.setText(PENDING.toString()); } - this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0)); -// this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND); -// this.setTextSelectionColor(Color.WHITE); -// this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE); return this; } }; diff --git a/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java b/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java index 8162c7ba86..93490f7116 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icheckbox/UICheckBox.java @@ -1,13 +1,11 @@ package com.fr.design.gui.icheckbox; -import com.fr.design.constants.UIConstants; +import com.fine.theme.icon.LazyIcon; import com.fr.design.event.GlobalNameListener; import com.fr.design.event.GlobalNameObserver; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.core.UITextComponent; -import com.fr.design.utils.gui.GUIPaintUtils; -import com.fr.stable.Constants; import sun.swing.SwingUtilities2; import javax.swing.AbstractButton; @@ -144,7 +142,7 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser * * @return UICheckBoxUI */ - public UICheckBoxUI getUICheckBoxUI(){ + public UICheckBoxUI getUICheckBoxUI() { return new UICheckBoxUI(); } @@ -176,28 +174,15 @@ public class UICheckBox extends JCheckBox implements UIObserver, GlobalNameObser b.getVerticalTextPosition(), b.getHorizontalTextPosition(), viewRect, iconRect, textRect, b.getIconTextGap()); - // fill background - if (c.isOpaque()) { - g.setColor(b.getBackground()); - g.fillRect(0, 0, size.width, size.height); - } - Graphics2D g2d = (Graphics2D) g; g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); if (model.isSelected()) { - GUIPaintUtils.fillPaint(g2d, iconRect.x, iconRect.y, iconRect.width, iconRect.height, false, Constants.NULL, - model.isEnabled() ? UIConstants.CHECKBOX_HOVER_SELECTED : UIConstants.DISABLED_ICON_COLOR, 0); - } else if (model.isRollover() && !model.isSelected()) { - g.setColor(UIConstants.CHECKBOX_HOVER_SELECTED); - g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC); + new LazyIcon("checkbox_checked").paintIcon(c, g, iconRect.x, iconRect.y); + } else if (model.isRollover()) { + new LazyIcon("checkbox_hovered").paintIcon(c, g, iconRect.x, iconRect.y); } else { - g.setColor(UIConstants.LINE_COLOR); - g2d.drawRoundRect(iconRect.x, iconRect.y, iconRect.width - 1, iconRect.height - 1, UIConstants.ARC, UIConstants.ARC); + new LazyIcon("checkbox_unchecked").paintIcon(c, g, iconRect.x, iconRect.y); } - - if (model.isSelected()) { - UIConstants.YES_ICON.paintIcon(c, g, iconRect.x + 2, iconRect.y + 2); - } g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); // Draw the Text diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/UIFlatTreeUI.java b/designer-base/src/main/java/com/fr/design/gui/itree/UIFlatTreeUI.java new file mode 100644 index 0000000000..d8d9546a25 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/itree/UIFlatTreeUI.java @@ -0,0 +1,32 @@ +package com.fr.design.gui.itree; + +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.ui.FlatTreeUI; + +import javax.swing.JComponent; +import javax.swing.plaf.ComponentUI; + +/** + * 主题化的TreeUI，继承自FlatTreeUI + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/11/29 + */ +public class UIFlatTreeUI extends FlatTreeUI { + + /** + * 创建组件UI + * @param x 组件 + * @return 返回组件UI + */ + public static ComponentUI createUI(JComponent x) { + return new UIFlatTreeUI(); + } + + protected void installDefaults() { + super.installDefaults(); + setExpandedIcon(new LazyIcon("minus")); + setCollapsedIcon(new LazyIcon("plus")); + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java b/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java index a4d66c4384..af6dfc7ead 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java @@ -1,6 +1,5 @@ package com.fr.design.gui.itree; -import com.fr.base.BaseUtils; import com.fr.base.svg.IconUtils; import com.fr.design.utils.ThemeUtils; diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java index e06ac43033..00f740983a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/checkboxtree/CheckBoxTree.java @@ -117,9 +117,6 @@ public class CheckBoxTree extends JTree { for (int i = 0, length = listeners.length; i < length; i++) { component.removeMouseListener(listeners[i]); } -// for (MouseListener listener : listeners) { -// component.removeMouseListener(listener); -// } for (int i = 0; i < listeners.length; i++) { MouseListener listener = listeners[i]; if (index == i) { @@ -357,9 +354,6 @@ public class CheckBoxTree extends JTree { TreePath tmpTreePath = treePaths[i]; toggleSelection(tmpTreePath); } -// for (TreePath treePath : treePaths) { -// toggleSelection(treePath); -// } } } diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java index de1411c408..6b65cd3770 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/EnvFileTree.java @@ -12,7 +12,6 @@ import com.fr.stable.CoreConstants; import com.fr.stable.StableUtils; import com.fr.workspace.WorkContext; -import javax.swing.BorderFactory; import javax.swing.JTree; import javax.swing.tree.DefaultTreeCellRenderer; import javax.swing.tree.DefaultTreeModel; @@ -59,7 +58,7 @@ public class EnvFileTree extends RefreshableJTree { // CellRenderer // 这里新建一个Label作为render是因为JTree在动态刷新的时候，节点上render画布的的宽度不会变，会使得一部分比较长的数据显示为 - DefaultTreeCellRenderer fileTreeCellRenderer = new DefaultTreeCellRenderer() { + DefaultTreeCellRenderer fileTreeCellRenderer = new FineTreeCellRender() { @Override public Component getTreeCellRendererComponent(JTree tree, Object value, boolean selected, boolean expanded, boolean leaf, int row, @@ -75,7 +74,7 @@ public class EnvFileTree extends RefreshableJTree { if (lock != null && !lock.equals(node.getUserID())) { name = name + Toolkit.i18nText("Fine-Design_Basic_Template_Status_Locked", "(", ")"); } - this.setIcon(FileTreeIcon.getIcon(node)); + this.setIcon(FileTreeIcon.getIconWithExpandAttr(node, expanded)); } else { this.setIcon(FileTreeIcon.getFolderHalfImageIcon()); } @@ -84,10 +83,6 @@ public class EnvFileTree extends RefreshableJTree { this.setIcon(null); this.setText(PENDING.toString()); } - this.setBorder(BorderFactory.createEmptyBorder(1, 0, 1, 0)); -// this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND); -// this.setTextSelectionColor(Color.WHITE); -// this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE); return this; } }; 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 194dfa82de..785bca06b4 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 @@ -1,5 +1,6 @@ package com.fr.design.gui.itree.filetree; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.base.svg.IconUtils; import com.fr.design.ExtraDesignClassManager; @@ -23,14 +24,16 @@ public class FileTreeIcon { public static final String FILE_LOCKED_ICON_PATH = "/com/fr/design/images/gui/file_lock.png"; - public static final Icon BLANK_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/blank.gif"); - - 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/folder_half_authority.svg"); + public static final Icon FOLDER_IMAGE_ICON = new LazyIcon("folder"); + public static final Icon FOLDER_OPEN_IMAGE_ICON = new LazyIcon("folder_open"); + public static final Icon MODERN_CPT_FILE_IMAGE_ICON = new LazyIcon("cpt_icon"); + public static final Icon MODERN_FRM_FILE_IMAGE_ICON = new LazyIcon("frm_icon"); public static final Icon FILE_IMAGE_ICON = UIManager.getIcon("FileView.fileIcon"); + // TODO: 以下Icon视觉暂未提供，需提供后替换 + public static final Icon BLANK_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/blank.gif"); + public static final Icon FOLDER_HALF_IMAGE_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/folder_half_authority.svg"); public static final Icon JAVA_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/javaFile.gif"); public static final Icon CLASS_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/classFile.gif"); public static final Icon JSP_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/jspFile.gif"); @@ -41,16 +44,8 @@ public class FileTreeIcon { public static final Icon GIF_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/gifFile.gif"); public static final Icon JPG_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/jpgFile.gif"); public static final Icon BMP_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/bmpFile.gif"); - public static final Icon CPT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cptFile.png"); - public static final Icon FRM_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/frm.png"); - 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/cpt_icon.svg"); - public static final Icon MODERN_FRM_FILE_IMAGE_ICON = - 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/cht_icon.svg"); + public static final Icon MODERN_CHT_FILE_IMAGE_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cht_icon.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"); @@ -149,24 +144,45 @@ public class FileTreeIcon { return getIcon(node, showLock); } + /** + * 获取文件节点对应的图标(含展开与否的属性) + * + * @param node 文件节点 + * @param isExpand 是否已扩展出子节点 + * + * @return 文件节点的图标 + */ + public static Icon getIconWithExpandAttr(FileNode node, boolean isExpand) { + boolean showLock = node.getLock() != null && !ComparatorUtils.equals(node.getUserID(), node.getLock()); + return getIconWithExpandAttr(node, showLock, isExpand); + } + public static Icon getIcon(FileNode node, boolean isShowLock) { + return getIconWithExpandAttr(node, isShowLock, false); + } + + private static Icon getIconWithExpandAttr(FileNode node, boolean isShowLock, boolean isExpand) { String path = StableUtils.pathJoin(WorkContext.getCurrent().getPath(), node.getEnvPath()); if (WorkContext.getCurrent().isLocal()) { File ff = new File(path); if (ff.exists()) { if (node.isDirectory()) { - return FileTreeIcon.FOLDER_IMAGE_ICON; + return getFolderIcon(isExpand); } return getLocalFileIcon(path, isShowLock); } } if (node.isDirectory()) { - return FileTreeIcon.FOLDER_IMAGE_ICON; + return getFolderIcon(isExpand); } else { return getRemoteFileIcon(node, isShowLock); } } + private static Icon getFolderIcon(boolean isExpand) { + return isExpand ? FileTreeIcon.FOLDER_OPEN_IMAGE_ICON : FileTreeIcon.FOLDER_IMAGE_ICON; + } + private static Icon getLocalFileIcon(String path, boolean isShowLock) { Icon icon = getExtraIcon(path, isShowLock); if (icon != null) { diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FineTreeCellRender.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FineTreeCellRender.java new file mode 100644 index 0000000000..1df1325678 --- /dev/null +++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FineTreeCellRender.java @@ -0,0 +1,30 @@ +package com.fr.design.gui.itree.filetree; + +import javax.swing.JTree; +import javax.swing.UIManager; +import javax.swing.BorderFactory; +import javax.swing.tree.DefaultTreeCellRenderer; +import java.awt.*; + +/** + * Tree子节点的渲染器 + * + * @author Levy.Xie + * @since 11.0 + * Created on 2023/11/28 + */ +public class FineTreeCellRender extends DefaultTreeCellRenderer { + + private static final long serialVersionUID = 1L; + + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, boolean sel, boolean expanded, boolean leaf, int row, boolean hasFocus) { + super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, row, hasFocus); + Insets margins = UIManager.getInsets("Tree.rendererMargins"); + this.setBorder(BorderFactory.createEmptyBorder(margins.top, margins.left, + margins.bottom, margins.right)); + + this.setIconTextGap(UIManager.getInt("Tree.iconTextGap")); + return this; + } +} diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java index 113b2e4b45..6a8433225a 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java +++ b/designer-base/src/main/java/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java @@ -54,7 +54,6 @@ public abstract class RefreshableJTree extends CheckBoxTree { ExpandMutableTreeNode root = (ExpandMutableTreeNode) model.getRoot(); root.setExpanded(true); this.setRootVisible(false); -// this.setBackground(UIConstants.TREE_BACKGROUND); this.addTreeExpansionListener(expansion); this.addTreeWillExpandListener(willExpand); } 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 3df9250733..115d4aeaf2 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 @@ -428,7 +428,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public NewFolderAction() { this.setName(KeySetUtils.NEW_FOLDER.getMenuKeySetName()); - this.setSmallIcon("/com/fr/design/standard/newfolder/new_folder"); + this.setSmallIcon(new LazyIcon("new_folder")); } @Override @@ -470,7 +470,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", false); + this.setSmallIcon(new LazyIcon("collapse_all")); } @Override @@ -486,7 +486,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt private class VcsAction extends UpdateAction { public VcsAction() { - this.setSmallIcon("/com/fr/design/standard/vcslist/vcs_list"); + this.setSmallIcon(new LazyIcon("vcs_list")); } @Override @@ -569,7 +569,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public ShowInExplorerAction() { this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Show_In_Containing_Folder")); - this.setSmallIcon("/com/fr/design/standard/viewfolder/view_folder"); + this.setSmallIcon(new LazyIcon("view_folder")); } @Override @@ -586,7 +586,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt public RefreshTreeAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Refresh")); - this.setSmallIcon("/com/fr/design/standard/refresh", false); + this.setSmallIcon(new LazyIcon("refresh")); } @Override diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked.svg new file mode 100644 index 0000000000..fa4b47ddd7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked_disable.svg new file mode 100644 index 0000000000..88df5c1a59 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/hovered.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/hovered.svg new file mode 100644 index 0000000000..54a7539d4d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/hovered.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/part_checked.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/part_checked.svg new file mode 100644 index 0000000000..caeebfd58c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/part_checked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked.svg new file mode 100644 index 0000000000..86fa2f7148 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked_disable.svg new file mode 100644 index 0000000000..cab88105ee --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off.svg rename to designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off.svg diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off_disable.svg new file mode 100644 index 0000000000..9c2a3730b1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on.svg rename to designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on.svg diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on_disable.svg new file mode 100644 index 0000000000..042c928afa --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/class_table_data.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/class_table_data.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/fine/theme/icon/dataset/class_table_data.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/connection.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/connection.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/connection.svg rename to designer-base/src/main/resources/com/fine/theme/icon/dataset/connection.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/data_table.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/data_table.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/fine/theme/icon/dataset/data_table.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/database.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/database.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/fine/theme/icon/dataset/database.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/editdataset/edit.svg rename to designer-base/src/main/resources/com/fine/theme/icon/dataset/edit.svg diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit_disable.svg new file mode 100644 index 0000000000..409fe0d749 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/edit_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/field.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/field.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/fine/theme/icon/dataset/field.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/file.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/file.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/fine/theme/icon/dataset/file.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/multi.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/multi.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/fine/theme/icon/dataset/multi.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview.svg rename to designer-base/src/main/resources/com/fine/theme/icon/dataset/preview.svg diff --git a/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview_disable.svg new file mode 100644 index 0000000000..f663e9cbb4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/dataset/preview_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/server_database.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/server_database.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/fine/theme/icon/dataset/server_database.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/store_procedure.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/store_procedure.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/fine/theme/icon/dataset/store_procedure.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/tree.svg b/designer-base/src/main/resources/com/fine/theme/icon/dataset/tree.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/fine/theme/icon/dataset/tree.svg diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all.svg new file mode 100644 index 0000000000..d0040b8551 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg new file mode 100644 index 0000000000..ad625939c6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg new file mode 100644 index 0000000000..65e47758f6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg new file mode 100644 index 0000000000..9cfaf72f91 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder.svg new file mode 100644 index 0000000000..4dd51d6ea1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg new file mode 100644 index 0000000000..c68e5c464b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg new file mode 100644 index 0000000000..4eb67dbe7c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg new file mode 100644 index 0000000000..768daca872 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg new file mode 100644 index 0000000000..de1e9e0032 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg new file mode 100644 index 0000000000..c21036aee8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/minus.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/minus.svg new file mode 100644 index 0000000000..75878fc8c2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/minus.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg new file mode 100644 index 0000000000..1b6be8d0de --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg new file mode 100644 index 0000000000..0f80825179 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/plus.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/plus.svg new file mode 100644 index 0000000000..ca1e276691 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/plus.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg new file mode 100644 index 0000000000..48b431577e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg new file mode 100644 index 0000000000..d54fdf70ad --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg new file mode 100644 index 0000000000..7b47879915 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg new file mode 100644 index 0000000000..f5066f037b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg new file mode 100644 index 0000000000..c21bbce647 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg new file mode 100644 index 0000000000..1fb00c82e7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg new file mode 100644 index 0000000000..9781e5d2e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg new file mode 100644 index 0000000000..0a89f2ef5c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/remove/remove.svg b/designer-base/src/main/resources/com/fine/theme/icon/remove.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/remove/remove.svg rename to designer-base/src/main/resources/com/fine/theme/icon/remove.svg diff --git a/designer-base/src/main/resources/com/fine/theme/icon/remove_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/remove_disable.svg new file mode 100644 index 0000000000..927064446e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/remove_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/search.svg b/designer-base/src/main/resources/com/fine/theme/icon/search.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/search.svg rename to designer-base/src/main/resources/com/fine/theme/icon/search.svg diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties index b35df4f71f..cee3a00b75 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties @@ -84,7 +84,7 @@ ToggleButtonUI = com.fine.theme.light.ui.FineToggleButtonUI ToolBarUI = com.formdev.flatlaf.ui.FlatToolBarUI ToolBarSeparatorUI = com.formdev.flatlaf.ui.FlatToolBarSeparatorUI ToolTipUI = com.formdev.flatlaf.ui.FlatToolTipUI -TreeUI = com.formdev.flatlaf.ui.FlatTreeUI +TreeUI = com.fr.design.gui.itree.UIFlatTreeUI ViewportUI = com.formdev.flatlaf.ui.FlatViewportUI @@ -1027,7 +1027,7 @@ Tree.dropCellBackground = @dropCellBackground Tree.dropCellForeground = @dropCellForeground Tree.dropLineColor = @dropLineColor Tree.rendererFillBackground = false -Tree.rendererMargins = 1,2,1,2 +Tree.rendererMargins = 4,0,4,0 Tree.selectionInsets = 0,0,0,0 Tree.selectionArc = 0 Tree.wideSelection = true @@ -1038,6 +1038,7 @@ Tree.showDefaultIcons = false Tree.leftChildIndent = 7 Tree.rightChildIndent = 11 Tree.rowHeight = 0 +Tree.iconTextGap = 6 Tree.expandedIcon = com.formdev.flatlaf.icons.FlatTreeExpandedIcon Tree.collapsedIcon = com.formdev.flatlaf.icons.FlatTreeCollapsedIcon diff --git a/designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_disabled.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_disable.svg rename to designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_disabled.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_normal.svg new file mode 100644 index 0000000000..c81b5419aa --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/batchesdoff/batch_esd_off_normal.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_disabled.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_disable.svg rename to designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_disabled.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_normal.svg new file mode 100644 index 0000000000..13f924d88b --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/batchesdon/batch_esd_on_normal.svg @@ -0,0 +1,3 @@ + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked.svg new file mode 100644 index 0000000000..fa4b47ddd7 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked.svg @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked_disable.svg new file mode 100644 index 0000000000..88df5c1a59 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/checked_disable.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/hovered.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/hovered.svg new file mode 100644 index 0000000000..54a7539d4d --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/hovered.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/part_checked.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/part_checked.svg new file mode 100644 index 0000000000..caeebfd58c --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/part_checked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked.svg new file mode 100644 index 0000000000..86fa2f7148 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked_disable.svg new file mode 100644 index 0000000000..cab88105ee --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/checkbox/unchecked_disable.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/class_table_data_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/class_table_data_normal.svg new file mode 100644 index 0000000000..19fc851ecd --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/class_table_data_normal.svg @@ -0,0 +1,4 @@ + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/connection_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/connection_normal.svg new file mode 100644 index 0000000000..7c865b45e0 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/connection_normal.svg @@ -0,0 +1,11 @@ + + + icon_定义数据连接_normal备份 + + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/data_table_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/data_table_normal.svg new file mode 100644 index 0000000000..220cd95269 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/data_table_normal.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/database_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/database_normal.svg new file mode 100644 index 0000000000..8c0361dcda --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/database_normal.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_disabled.svg similarity index 89% rename from designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_disable.svg rename to designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_disabled.svg index c93e1e6904..9b001cfc5f 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_disable.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_disabled.svg @@ -1,5 +1,5 @@ - + icon_编辑_disable diff --git a/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_normal.svg new file mode 100644 index 0000000000..2917194523 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/editdataset/edit_normal.svg @@ -0,0 +1,8 @@ + + + icon_编辑_normal + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/field_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/field_normal.svg new file mode 100644 index 0000000000..608d1fd589 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/field_normal.svg @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/file_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/file_normal.svg new file mode 100644 index 0000000000..cafbff6526 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/file_normal.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/multi_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/multi_normal.svg new file mode 100644 index 0000000000..0c8144e634 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/multi_normal.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_disabled.svg similarity index 92% rename from designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_disable.svg rename to designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_disabled.svg index b0e8234410..6f2c4afa1f 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_disable.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_disabled.svg @@ -1,5 +1,5 @@ - + icon_预览_disabled diff --git a/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_normal.svg new file mode 100644 index 0000000000..0412b5e108 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/previewdateset/preview_normal.svg @@ -0,0 +1,7 @@ + + + icon_预览_normal + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/remove/remove_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/remove/remove_disabled.svg similarity index 89% rename from designer-base/src/main/resources/com/fr/design/standard/remove/remove_disable.svg rename to designer-base/src/main/resources/com/fr/design/standard/remove/remove_disabled.svg index 93bca0fc3c..b57f9a853d 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/remove/remove_disable.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/remove/remove_disabled.svg @@ -1,5 +1,5 @@ - + icon_删除_normal diff --git a/designer-base/src/main/resources/com/fr/design/standard/remove/remove_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/remove/remove_normal.svg new file mode 100644 index 0000000000..b09268f454 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/remove/remove_normal.svg @@ -0,0 +1,9 @@ + + + icon_删除_normal备份 + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/search_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/search_normal.svg new file mode 100644 index 0000000000..673548dfaf --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/search_normal.svg @@ -0,0 +1,7 @@ + + + icon_搜索_normal + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/server_database_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/server_database_normal.svg new file mode 100644 index 0000000000..50a509fcbf --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/server_database_normal.svg @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/store_procedure_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/store_procedure_normal.svg new file mode 100644 index 0000000000..55393d59ab --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/store_procedure_normal.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/tree_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/tree_normal.svg new file mode 100644 index 0000000000..cc965888e7 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/tree_normal.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + \ No newline at end of file