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..5854b8d6e1 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 @@ -44,7 +44,25 @@ public class FineLightIconSet extends AbstractIconSet { 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("field", "com/fr/design/standard/field.svg", true), + + // 目录树相关Icon + new SvgIconSource("folder", "com/fr/design/standard/fileicon/folder.svg", true), + new SvgIconSource("folder_open", "com/fr/design/standard/fileicon/folder_open.svg", true), + new SvgIconSource("cpt_icon", "com/fr/design/standard/fileicon/cpt_icon.svg", true), + new SvgIconSource("frm_icon", "com/fr/design/standard/fileicon/frm_icon.svg", true), + new SvgIconSource("fvs_icon", "com/fr/design/standard/fileicon/fvs_icon.svg", true), + new SvgIconSource("excel_icon", "com/fr/design/standard/fileicon/excel_icon.svg", true), + new SvgIconSource("minus", "com/fr/design/standard/fileicon/minus.svg", true), + new SvgIconSource("plus", "com/fr/design/standard/fileicon/plus.svg", true), + new SvgIconSource("locate", "com/fr/design/standard/locate/locate.svg", true), + new SvgIconSource("rename", "com/fr/design/standard/rename/rename.svg", true), + new SvgIconSource("collapse_all", "com/fr/design/standard/collapse_all.svg", true), + new SvgIconSource("vcs_list", "com/fr/design/standard/vcslist/vcs_list.svg", true), + new SvgIconSource("view_folder", "com/fr/design/standard/viewfolder/view_folder.svg", true), + new SvgIconSource("refresh", "com/fr/design/standard/refresh.svg", true), + new SvgIconSource("new_folder", "com/fr/design/standard/newfolder/new_folder.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/itree/UITreeUI.java b/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java index a4d66c4384..bb932187b2 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,5 +1,7 @@ package com.fr.design.gui.itree; +import com.fine.theme.icon.LazyIcon; +import com.formdev.flatlaf.ui.FlatTreeUI; import com.fr.base.BaseUtils; import com.fr.base.svg.IconUtils; import com.fr.design.utils.ThemeUtils; @@ -16,7 +18,7 @@ import javax.swing.tree.DefaultTreeCellRenderer; * Date: 13-12-31 * Time: 下午4:58 */ -public class UITreeUI extends MetalTreeUI { +public class UITreeUI extends FlatTreeUI { /** * 创建组件UI * @param x 组件 @@ -28,14 +30,7 @@ public class UITreeUI extends MetalTreeUI { protected void installDefaults() { super.installDefaults(); - setExpandedIcon(IconUtils.readIcon("/com/fr/design/standard/fileicon/minus.svg")); - setCollapsedIcon(IconUtils.readIcon("/com/fr/design/standard/fileicon/plus.svg")); - if (tree.getCellRenderer() instanceof DefaultTreeCellRenderer) { - DefaultTreeCellRenderer r = (DefaultTreeCellRenderer) tree.getCellRenderer(); - r.setBackgroundNonSelectionColor(ThemeUtils.TEXT_BG_COLOR); - r.setBackgroundSelectionColor(ThemeUtils.TEXT_SELECTED_BG_COLOR); - r.setTextNonSelectionColor(ThemeUtils.NORMAL_FOREGROUND); - r.setTextSelectionColor(ThemeUtils.TEXT_BG_COLOR); - } + setExpandedIcon(new LazyIcon("minus")); + setCollapsedIcon(new LazyIcon("plus")); } } \ No newline at end of file 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/light/ui/laf/FineLightLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLightLaf.properties index b35df4f71f..fbceec41c4 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.UITreeUI 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/images/newui/cpt_icon.svg b/designer-base/src/main/resources/com/fr/design/images/newui/cpt_icon.svg new file mode 100644 index 0000000000..131380bdfa --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/newui/cpt_icon.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/newui/folder.svg b/designer-base/src/main/resources/com/fr/design/images/newui/folder.svg new file mode 100644 index 0000000000..b18a8a15ea --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/newui/folder.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/newui/folder_open.svg b/designer-base/src/main/resources/com/fr/design/images/newui/folder_open.svg new file mode 100644 index 0000000000..ff22b046e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/newui/folder_open.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/images/newui/frm_icon.svg b/designer-base/src/main/resources/com/fr/design/images/newui/frm_icon.svg new file mode 100644 index 0000000000..10717832b0 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/newui/frm_icon.svg @@ -0,0 +1,12 @@ + + + + + + + + + + + + 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.svg new file mode 100644 index 0000000000..d0040b8551 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/collapse_all.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/collapse_all_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/collapse_all_disable.svg new file mode 100644 index 0000000000..ad625939c6 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/collapse_all_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/collapse_all_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/collapse_all_normal.svg deleted file mode 100644 index 45b28a56b3..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/collapse_all_normal.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/cpt_icon.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cpt_icon.svg index d691f38b67..65e47758f6 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/fileicon/cpt_icon.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cpt_icon.svg @@ -1,9 +1,10 @@ - - - - - - - - - \ No newline at end of file + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/excel_icon.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/excel_icon.svg new file mode 100644 index 0000000000..9cfaf72f91 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/excel_icon.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg index ebafeec23c..4dd51d6ea1 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg @@ -1,3 +1,8 @@ - - - \ No newline at end of file + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder_open.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder_open.svg new file mode 100644 index 0000000000..c68e5c464b --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder_open.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/frm_icon.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/frm_icon.svg index fa61a511fe..4eb67dbe7c 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/fileicon/frm_icon.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/frm_icon.svg @@ -1,9 +1,12 @@ - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/fvs_icon.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/fvs_icon.svg new file mode 100644 index 0000000000..768daca872 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/fvs_icon.svg @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg index db4e76f2a9..75878fc8c2 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg @@ -1,3 +1,5 @@ - - - \ No newline at end of file + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg index f012490aee..ca1e276691 100644 --- a/designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg +++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg @@ -1,3 +1,5 @@ - - - \ No newline at end of file + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/locate/locate.svg b/designer-base/src/main/resources/com/fr/design/standard/locate/locate.svg new file mode 100644 index 0000000000..de1e9e0032 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/locate/locate.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/locate/locate_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/locate/locate_disable.svg new file mode 100644 index 0000000000..c21036aee8 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/locate/locate_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/locate/locate_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/locate/locate_disabled.svg deleted file mode 100644 index 3a94510fb0..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/locate/locate_disabled.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/locate/locate_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/locate/locate_normal.svg deleted file mode 100644 index 6c78878c0a..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/locate/locate_normal.svg +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder.svg b/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder.svg new file mode 100644 index 0000000000..1b6be8d0de --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disable.svg new file mode 100644 index 0000000000..0f80825179 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disabled.svg deleted file mode 100644 index f3936e1539..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disabled.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - icon_NewFolderIcon_disable - - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_normal.svg deleted file mode 100644 index 85f41e26a7..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_normal.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - icon_NewFolderIcon_normal - - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/refresh.svg b/designer-base/src/main/resources/com/fr/design/standard/refresh.svg new file mode 100644 index 0000000000..48b431577e --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/refresh.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/refresh_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/refresh_disable.svg new file mode 100644 index 0000000000..d54fdf70ad --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/refresh_disable.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/refresh_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/refresh_normal.svg deleted file mode 100644 index 4e3fd9c147..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/refresh_normal.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon_刷新_normal - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/rename/rename.svg b/designer-base/src/main/resources/com/fr/design/standard/rename/rename.svg new file mode 100644 index 0000000000..7b47879915 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/rename/rename.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/rename/rename_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/rename/rename_disable.svg new file mode 100644 index 0000000000..f5066f037b --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/rename/rename_disable.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/rename/rename_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/rename/rename_disabled.svg deleted file mode 100644 index 953e12eaa9..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/rename/rename_disabled.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon_重命名_disable - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/rename/rename_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/rename/rename_normal.svg deleted file mode 100644 index a2c287789d..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/rename/rename_normal.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon_重命名_normal - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list.svg b/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list.svg new file mode 100644 index 0000000000..c21bbce647 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disable.svg new file mode 100644 index 0000000000..1fb00c82e7 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disable.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disabled.svg deleted file mode 100644 index b88ee0998e..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disabled.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon_版本管理_disabled - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_normal.svg deleted file mode 100644 index ebfca43899..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_normal.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon_版本管理_normal - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder.svg b/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder.svg new file mode 100644 index 0000000000..9781e5d2e2 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disable.svg b/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disable.svg new file mode 100644 index 0000000000..0a89f2ef5c --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disable.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disabled.svg deleted file mode 100644 index 376d372d41..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disabled.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon_打开文件_disable - - - - \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_normal.svg deleted file mode 100644 index 42ae6cbd3d..0000000000 --- a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_normal.svg +++ /dev/null @@ -1,7 +0,0 @@ - - - icon_所在文件夹_normal - - - - \ No newline at end of file