From d92d0e7b181189c8e70092a903f64f0332f7aa7d Mon Sep 17 00:00:00 2001 From: renekton Date: Mon, 5 Aug 2024 14:28:47 +0800 Subject: [PATCH] fr --- .../com/fr/design/formula/FunctionManagerPane.java | 2 +- .../com/fine/theme/icon/param/advanced_editor.svg | 4 ---- .../com/fine/theme/icon/widget/user_widget.svg | 10 ---------- .../com/fine/theme/light/ui/fine_light.icon.json | 1 + .../com/fr/design/images/edit/advancedEditor.svg | 4 ---- .../java/com/fr/design/headerfooter/HFComponent.java | 2 +- 6 files changed, 3 insertions(+), 20 deletions(-) delete mode 100644 designer-base/src/main/resources/com/fine/theme/icon/param/advanced_editor.svg delete mode 100644 designer-base/src/main/resources/com/fine/theme/icon/widget/user_widget.svg delete mode 100644 designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java index 2acf6e772a..f1e15bf4a1 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionManagerPane.java @@ -104,7 +104,7 @@ public class FunctionManagerPane extends BasicPane { @Override public NameableCreator[] createNameableCreators() { NameableCreator funcDef = new NameObjectCreator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Function"), - new LazyIcon("param"), FunctionDef.class, FunctionContentPane.class); + new LazyIcon("page_query"), FunctionDef.class, FunctionContentPane.class); return new NameableCreator[]{funcDef}; } diff --git a/designer-base/src/main/resources/com/fine/theme/icon/param/advanced_editor.svg b/designer-base/src/main/resources/com/fine/theme/icon/param/advanced_editor.svg deleted file mode 100644 index 84c516886f..0000000000 --- a/designer-base/src/main/resources/com/fine/theme/icon/param/advanced_editor.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/designer-base/src/main/resources/com/fine/theme/icon/widget/user_widget.svg b/designer-base/src/main/resources/com/fine/theme/icon/widget/user_widget.svg deleted file mode 100644 index af4281adf2..0000000000 --- a/designer-base/src/main/resources/com/fine/theme/icon/widget/user_widget.svg +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json index 9a2987e2d7..1aeb2eef61 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/fine_light.icon.json @@ -146,6 +146,7 @@ "image": "insert/image.svg", "bias": "insert/bias.svg", "sub_report": "insert/sub_report.svg", + "float_normal": "insert/float_normal.svg", "popup": { "normal": "popup/popup.svg" }, diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg b/designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg deleted file mode 100644 index 84c516886f..0000000000 --- a/designer-base/src/main/resources/com/fr/design/images/edit/advancedEditor.svg +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java index 4de5de08bb..a81f4a5667 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java @@ -297,7 +297,7 @@ public class HFComponent extends UILabel implements MoveActionListener { } else if (hfElement.getClass().equals(ImageHFElement.class)) { return new LazyIcon("image"); } else if (hfElement.getClass().equals(NewLineHFElement.class)) { - return new LazyIcon("newline"); + return new LazyIcon("new_line"); } return BaseUtils.readIcon("/com/fr/base/images/dialog/headerfooter/undefined.png");