From d8fd0f344131278fdf4d6954379873e3ac3177cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Levy=2EXie-=E8=A7=A3=E5=AE=89=E6=A3=AE?= Date: Wed, 29 Nov 2023 10:49:30 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-107972=20=E8=AE=BE=E8=AE=A1=E5=99=A8?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E7=BF=BB=E6=96=B0=20=E6=96=B0=E5=A2=9ETreeUI?= =?UTF-8?q?=E3=80=81icon=E6=96=87=E4=BB=B6=E5=A4=B9=E8=BD=AC=E7=A7=BB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fine/theme/light/ui/FineLightIconSet.java | 72 ++++++++++--------- .../com/fr/design/gui/itree/UIFlatTreeUI.java | 32 +++++++++ .../com/fr/design/gui/itree/UITreeUI.java | 16 +++-- .../com/fine/theme/icon/checkbox/checked.svg | 19 +++++ .../theme/icon/checkbox/checked_disable.svg | 7 ++ .../com/fine/theme/icon/checkbox/hovered.svg | 6 ++ .../fine/theme/icon/checkbox/part_checked.svg | 6 ++ .../fine/theme/icon/checkbox/unchecked.svg | 6 ++ .../theme/icon/checkbox/unchecked_disable.svg | 6 ++ .../theme/icon/dataset}/batch_esd_off.svg | 0 .../icon/dataset/batch_esd_off_disable.svg | 8 +++ .../theme/icon/dataset}/batch_esd_on.svg | 0 .../icon/dataset/batch_esd_on_disable.svg | 8 +++ .../theme/icon/dataset}/class_table_data.svg | 0 .../theme/icon/dataset}/connection.svg | 0 .../theme/icon/dataset}/data_table.svg | 0 .../theme/icon/dataset}/database.svg | 0 .../theme/icon/dataset}/edit.svg | 0 .../fine/theme/icon/dataset/edit_disable.svg | 8 +++ .../theme/icon/dataset}/field.svg | 0 .../theme/icon/dataset}/file.svg | 0 .../theme/icon/dataset}/multi.svg | 0 .../theme/icon/dataset}/preview.svg | 0 .../theme/icon/dataset/preview_disable.svg | 8 +++ .../theme/icon/dataset}/server_database.svg | 0 .../theme/icon/dataset}/store_procedure.svg | 0 .../theme/icon/dataset}/tree.svg | 0 .../theme/icon/filetree}/collapse_all.svg | 0 .../icon/filetree}/collapse_all_disable.svg | 0 .../com/fine/theme/icon/filetree/cpt_icon.svg | 10 +++ .../theme/icon/filetree}/excel_icon.svg | 0 .../com/fine/theme/icon/filetree/folder.svg | 8 +++ .../theme/icon/filetree}/folder_open.svg | 0 .../com/fine/theme/icon/filetree/frm_icon.svg | 12 ++++ .../theme/icon/filetree}/fvs_icon.svg | 0 .../theme/icon/filetree}/locate.svg | 0 .../theme/icon/filetree}/locate_disable.svg | 0 .../com/fine/theme/icon/filetree/minus.svg | 5 ++ .../theme/icon/filetree}/new_folder.svg | 0 .../icon/filetree}/new_folder_disable.svg | 0 .../com/fine/theme/icon/filetree/plus.svg | 5 ++ .../theme/icon/filetree}/refresh.svg | 0 .../theme/icon/filetree}/refresh_disable.svg | 0 .../theme/icon/filetree}/rename.svg | 0 .../theme/icon/filetree}/rename_disable.svg | 0 .../theme/icon/filetree}/vcs_list.svg | 0 .../theme/icon/filetree}/vcs_list_disable.svg | 0 .../theme/icon/filetree}/view_folder.svg | 0 .../icon/filetree}/view_folder_disable.svg | 0 .../remove => fine/theme/icon}/remove.svg | 0 .../com/fine/theme/icon/remove_disable.svg | 9 +++ .../standard => fine/theme/icon}/search.svg | 0 .../light/ui/laf/FineLightLaf.properties | 2 +- 53 files changed, 211 insertions(+), 42 deletions(-) create mode 100644 designer-base/src/main/java/com/fr/design/gui/itree/UIFlatTreeUI.java create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/checkbox/checked_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/checkbox/hovered.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/checkbox/part_checked.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/checkbox/unchecked_disable.svg rename designer-base/src/main/resources/com/{fr/design/standard/batchesdoff => fine/theme/icon/dataset}/batch_esd_off.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_off_disable.svg rename designer-base/src/main/resources/com/{fr/design/standard/batchesdon => fine/theme/icon/dataset}/batch_esd_on.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/dataset/batch_esd_on_disable.svg rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/class_table_data.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/connection.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/data_table.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/database.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/editdataset => fine/theme/icon/dataset}/edit.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/dataset/edit_disable.svg rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/field.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/file.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/multi.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/previewdateset => fine/theme/icon/dataset}/preview.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/dataset/preview_disable.svg rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/server_database.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/store_procedure.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/dataset}/tree.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/filetree}/collapse_all.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/filetree}/collapse_all_disable.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/cpt_icon.svg rename designer-base/src/main/resources/com/{fr/design/standard/fileicon => fine/theme/icon/filetree}/excel_icon.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/folder.svg rename designer-base/src/main/resources/com/{fr/design/standard/fileicon => fine/theme/icon/filetree}/folder_open.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/frm_icon.svg rename designer-base/src/main/resources/com/{fr/design/standard/fileicon => fine/theme/icon/filetree}/fvs_icon.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/locate => fine/theme/icon/filetree}/locate.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/locate => fine/theme/icon/filetree}/locate_disable.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/minus.svg rename designer-base/src/main/resources/com/{fr/design/standard/newfolder => fine/theme/icon/filetree}/new_folder.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/newfolder => fine/theme/icon/filetree}/new_folder_disable.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/filetree/plus.svg rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/filetree}/refresh.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon/filetree}/refresh_disable.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/rename => fine/theme/icon/filetree}/rename.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/rename => fine/theme/icon/filetree}/rename_disable.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/vcslist => fine/theme/icon/filetree}/vcs_list.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/vcslist => fine/theme/icon/filetree}/vcs_list_disable.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/viewfolder => fine/theme/icon/filetree}/view_folder.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/viewfolder => fine/theme/icon/filetree}/view_folder_disable.svg (100%) rename designer-base/src/main/resources/com/{fr/design/standard/remove => fine/theme/icon}/remove.svg (100%) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/remove_disable.svg rename designer-base/src/main/resources/com/{fr/design/standard => fine/theme/icon}/search.svg (100%) 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 3212a4185..757bf62c6 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,45 +29,47 @@ 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/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), + 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/fr/design/standard/checkbox/checked.svg", true), - new SvgIconSource("checkbox_unchecked", "com/fr/design/standard/checkbox/unchecked.svg", true), - new SvgIconSource("checkbox_part_checked", "com/fr/design/standard/checkbox/part_checked.svg", true), - new SvgIconSource("checkbox_hovered", "com/fr/design/standard/checkbox/hovered.svg", true) + 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/gui/itree/UIFlatTreeUI.java b/designer-base/src/main/java/com/fr/design/gui/itree/UIFlatTreeUI.java new file mode 100644 index 000000000..d8d9546a2 --- /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 bb932187b..af6dfc7ea 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,8 +1,5 @@ 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; @@ -18,7 +15,7 @@ import javax.swing.tree.DefaultTreeCellRenderer; * Date: 13-12-31 * Time: 下午4:58 */ -public class UITreeUI extends FlatTreeUI { +public class UITreeUI extends MetalTreeUI { /** * 创建组件UI * @param x 组件 @@ -30,7 +27,14 @@ public class UITreeUI extends FlatTreeUI { protected void installDefaults() { super.installDefaults(); - setExpandedIcon(new LazyIcon("minus")); - setCollapsedIcon(new LazyIcon("plus")); + 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); + } } } \ No newline at end of file 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 000000000..fa4b47ddd --- /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 000000000..88df5c1a5 --- /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 000000000..54a7539d4 --- /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 000000000..caeebfd58 --- /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 000000000..86fa2f714 --- /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 000000000..cab88105e --- /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 000000000..9c2a3730b --- /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 000000000..042c928af --- /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 000000000..409fe0d74 --- /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 000000000..f663e9cbb --- /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/fr/design/standard/collapse_all.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all.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/fine/theme/icon/filetree/collapse_all.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/collapse_all_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/collapse_all_disable.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/collapse_all_disable.svg 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 000000000..65e47758f --- /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/fr/design/standard/fileicon/excel_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/excel_icon.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/excel_icon.svg 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 000000000..4dd51d6ea --- /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/fr/design/standard/fileicon/folder_open.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/folder_open.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/folder_open.svg 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 000000000..4eb67dbe7 --- /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/fr/design/standard/fileicon/fvs_icon.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/fileicon/fvs_icon.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/fvs_icon.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/locate/locate.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/locate/locate.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/locate.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/locate/locate_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/locate/locate_disable.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/locate_disable.svg 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 000000000..75878fc8c --- /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/fr/design/standard/newfolder/new_folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/newfolder/new_folder_disable.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/new_folder_disable.svg 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 000000000..ca1e27669 --- /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/fr/design/standard/refresh.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/refresh.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/refresh_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/refresh_disable.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/refresh_disable.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/rename/rename.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/rename/rename.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/rename.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/rename/rename_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/rename/rename_disable.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/rename_disable.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/vcslist/vcs_list_disable.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/vcs_list_disable.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder.svg diff --git a/designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg similarity index 100% rename from designer-base/src/main/resources/com/fr/design/standard/viewfolder/view_folder_disable.svg rename to designer-base/src/main/resources/com/fine/theme/icon/filetree/view_folder_disable.svg 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 000000000..927064446 --- /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 fbceec41c..cee3a00b7 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.fr.design.gui.itree.UITreeUI +TreeUI = com.fr.design.gui.itree.UIFlatTreeUI ViewportUI = com.formdev.flatlaf.ui.FlatViewportUI