From 1b066b4ff49aa092f8f6485cafd92166ac0a7b50 Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Fri, 1 Dec 2023 10:26:22 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-107973=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=E3=80=90=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E5=8E=9F=E5=9B=A0=E3=80=91rt=20=E3=80=90=E6=94=B9?= =?UTF-8?q?=E5=8A=A8=E6=80=9D=E8=B7=AF=E3=80=91=E6=9B=BF=E6=8D=A2=E8=8F=9C?= =?UTF-8?q?=E5=8D=95=E6=A0=8Ficon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fine/theme/light/ui/FineLightIconSet.java | 28 +++++++++++++++++-- .../search/pane/TreeSearchToolbarPane.java | 3 +- .../java/com/fr/design/icon/BorderIcon.java | 17 +++++------ .../style/color/UIToolbarColorButton.java | 4 +-- .../theme/icon/bindcolumn/bind_column.svg | 16 +++++++++++ .../icon/bindcolumn/bind_column_disable.svg | 16 +++++++++++ .../fine/theme/icon/cellstyle/h_center.svg | 10 +++++++ .../com/fine/theme/icon/cellstyle/h_left.svg | 10 +++++++ .../com/fine/theme/icon/cellstyle/h_right.svg | 10 +++++++ .../resources/com/fine/theme/icon/clear.svg | 11 ++++++++ .../com/fine/theme/icon/font/background.svg | 6 ++++ .../com/fine/theme/icon/font/bold.svg | 5 ++++ .../com/fine/theme/icon/font/foreground.svg | 5 ++++ .../com/fine/theme/icon/font/italic.svg | 5 ++++ .../com/fine/theme/icon/font/underline.svg | 5 ++++ .../com/fine/theme/icon/insert/bias.svg | 5 ++++ .../fine/theme/icon/insert/bias_disable.svg | 5 ++++ .../com/fine/theme/icon/insert/chart.svg | 5 ++++ .../fine/theme/icon/insert/chart_disable.svg | 5 ++++ .../com/fine/theme/icon/insert/formula.svg | 6 ++++ .../theme/icon/insert/formula_disable.svg | 6 ++++ .../com/fine/theme/icon/insert/image.svg | 8 ++++++ .../fine/theme/icon/insert/image_disable.svg | 8 ++++++ .../com/fine/theme/icon/insert/richtext.svg | 14 ++++++++++ .../theme/icon/insert/richtext_disable.svg | 14 ++++++++++ .../com/fine/theme/icon/insert/sub_report.svg | 15 ++++++++++ .../theme/icon/insert/sub_report_disable.svg | 15 ++++++++++ .../com/fine/theme/icon/insert/text.svg | 8 ++++++ .../fine/theme/icon/insert/text_disable.svg | 8 ++++++ .../com/fine/theme/icon/merge/merge.svg | 5 ++++ .../fine/theme/icon/merge/merge_disable.svg | 5 ++++ .../com/fine/theme/icon/merge/unmerge.svg | 5 ++++ .../fine/theme/icon/merge/unmerge_disable.svg | 5 ++++ .../resources/com/fine/theme/icon/noboder.svg | 5 ++++ .../com/fine/theme/icon/popup/popup.svg | 4 +++ .../fr/design/actions/cell/BorderAction.java | 4 +-- .../actions/cell/UIToolbarBorderButton.java | 5 ++-- .../actions/cell/style/AlignmentAction.java | 12 ++++---- .../cell/style/ReportFontBoldAction.java | 7 ++--- .../style/ReportFontForegroundAction.java | 5 ++-- .../cell/style/ReportFontItalicAction.java | 9 +++--- .../cell/style/ReportFontUnderlineAction.java | 9 +++--- .../cell/style/StyleBackgroundAction.java | 19 ++++++------- .../actions/edit/merge/MergeCellAction.java | 5 ++-- .../actions/edit/merge/UnmergeCellAction.java | 5 ++-- .../actions/insert/cell/BiasCellAction.java | 4 +-- .../actions/insert/cell/ChartCellAction.java | 6 ++-- .../insert/cell/DSColumnCellAction.java | 3 +- .../insert/cell/FormulaCellAction.java | 7 ++--- .../insert/cell/GeneralCellAction.java | 6 ++-- .../actions/insert/cell/ImageCellAction.java | 8 +++--- .../insert/cell/RichTextCellAction.java | 4 +-- .../insert/cell/SubReportCellAction.java | 4 +-- 53 files changed, 343 insertions(+), 81 deletions(-) create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_center.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_left.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_right.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/clear.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/font/background.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/font/foreground.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/bias.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/bias_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/chart.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/chart_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/formula.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/formula_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/image.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/image_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/richtext.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/richtext_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/text.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/insert/text_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/merge/merge.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/merge/merge_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/noboder.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/popup/popup.svg 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 757bf62c6b..9af2a3dff6 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 @@ -69,8 +69,32 @@ public class FineLightIconSet extends AbstractIconSet { 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) + new SvgIconSource("checkbox_hovered", "com/fine/theme/icon/checkbox/hovered.svg", true), - ); + // 菜单栏Icon + new SvgIconSource("bold", "com/fine/theme/icon/font/bold.svg"), + new SvgIconSource("italic", "com/fine/theme/icon/font/italic.svg"), + new SvgIconSource("underline", "com/fine/theme/icon/font/underline.svg"), + new SvgIconSource("foreground", "com/fine/theme/icon/font/foreground.svg"), + new SvgIconSource("background", "com/fine/theme/icon/font/background.svg"), + new SvgIconSource("h_left", "com/fine/theme/icon/cellstyle/h_left.svg"), + new SvgIconSource("h_center", "com/fine/theme/icon/cellstyle/h_center.svg"), + new SvgIconSource("h_right", "com/fine/theme/icon/cellstyle/h_right.svg"), + new SvgIconSource("noboder", "com/fine/theme/icon/noboder.svg", true), + new SvgIconSource("merge", "com/fine/theme/icon/merge/merge.svg", true), + new SvgIconSource("unmerge", "com/fine/theme/icon/merge/unmerge.svg", true), + new SvgIconSource("bind_column", "com/fine/theme/icon/bindcolumn/bind_column.svg", true), + new SvgIconSource("text", "com/fine/theme/icon/insert/text.svg", true), + new SvgIconSource("richtext", "com/fine/theme/icon/insert/richtext.svg", true), + new SvgIconSource("formula", "com/fine/theme/icon/insert/formula.svg", true), + new SvgIconSource("chart", "com/fine/theme/icon/insert/chart.svg", true), + new SvgIconSource("image", "com/fine/theme/icon/insert/image.svg", true), + new SvgIconSource("bias", "com/fine/theme/icon/insert/bias.svg", true), + new SvgIconSource("sub_report", "com/fine/theme/icon/insert/sub_report.svg", true), + new SvgIconSource("chart_line", "com/fine/theme/icon/chart/chart_line.svg", true), + new SvgIconSource("popup", "com/fine/theme/icon/popup/popup.svg", true), + new SvgIconSource("clear", "com/fine/theme/icon/clear.svg", true) + + ); } } diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java index 75b6bd77a5..d1c030742e 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/management/search/pane/TreeSearchToolbarPane.java @@ -1,7 +1,6 @@ package com.fr.design.data.datapane.management.search.pane; import com.fine.theme.icon.LazyIcon; -import com.fr.base.svg.IconUtils; import com.fr.design.DesignModelAdapter; import com.fr.design.constants.UIConstants; import com.fr.design.data.datapane.TableDataTreePane; @@ -150,7 +149,7 @@ public class TreeSearchToolbarPane extends JPanel implements TreeSearchStatusCha }); this.searchTextField.addKeyListener(enterPressed); // 右侧返回图标 - UILabel returnLabel = new UILabel(IconUtils.readIcon("/com/fr/design/standard/clear")); + UILabel returnLabel = new UILabel(new LazyIcon("clear")); returnLabel.setToolTipText(Toolkit.i18nText("Fine-Design_Tree_Search_Return")); returnLabel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 11)); returnLabel.addMouseListener(new MouseAdapter() { diff --git a/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java b/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java index 8250cd7022..d8ecb88a4f 100644 --- a/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java +++ b/designer-base/src/main/java/com/fr/design/icon/BorderIcon.java @@ -1,18 +1,16 @@ package com.fr.design.icon; +import com.fr.base.CellBorderStyle; +import com.fr.base.GraphHelper; import com.fr.stable.AssistUtils; +import com.fr.stable.Constants; + +import javax.swing.Icon; import java.awt.Color; import java.awt.Component; import java.awt.Graphics; import java.awt.Graphics2D; -import javax.swing.Icon; - -import com.fr.base.CellBorderStyle; -import com.fr.base.GraphHelper; -import com.fr.design.constants.UIConstants; -import com.fr.stable.Constants; - public class BorderIcon implements Icon { private int width = 14; @@ -57,7 +55,8 @@ public class BorderIcon implements Icon { || lineStyle == Constants.LINE_DOUBLE) { GraphHelper.drawLine(g, x1, y1, x2, y2, lineStyle); } else { - lineStyle = Constants.LINE_DOT; + lineStyle = Constants.LINE_THIN; + g.setColor(new Color(185, 189, 196)); if (AssistUtils.equals(y1, x2) && AssistUtils.equals(x2, y2)) { GraphHelper.drawLine(g, x1, y1, x2 + 1, y2, lineStyle); } else { @@ -75,8 +74,6 @@ public class BorderIcon implements Icon { int y1 = (defaultHeight - height) / 2; int y2 = (defaultHeight + height) / 2; Graphics2D gr = (Graphics2D) g; - gr.setColor(UIConstants.NORMAL_BACKGROUND); - gr.fillRect(x1, y1, width, height); drawLine(gr, x1, y1, x2, y1, cellBorderStyle.getTopStyle(), cellBorderStyle.getTopColor()); drawLine(gr, x2, y1, x2, y2, cellBorderStyle.getRightStyle(), diff --git a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java index c7c32f7956..5c27bc58cb 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java +++ b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java @@ -4,7 +4,7 @@ package com.fr.design.style.color; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.event.UIObserver; import com.fr.design.event.UIObserverListener; import com.fr.design.gui.ibutton.UIButton; @@ -35,7 +35,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi private UIObserverListener uiObserverListener; public UIToolbarColorButton(Icon icon) { - super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup"))); + super(new UIColorButton(icon), new UIButton(new LazyIcon("popup"))); getLeftButton().setEventBanned(true); getRightButton().addFocusListener(new FocusListener() { diff --git a/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column.svg b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column.svg new file mode 100755 index 0000000000..a3ed6545ca --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column_disable.svg new file mode 100755 index 0000000000..5858a92481 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/bindcolumn/bind_column_disable.svg @@ -0,0 +1,16 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_center.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_center.svg new file mode 100755 index 0000000000..4a52aa1cfe --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_center.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_left.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_left.svg new file mode 100755 index 0000000000..dbc0b2c62a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_left.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_right.svg b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_right.svg new file mode 100755 index 0000000000..d8a38dc46b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/cellstyle/h_right.svg @@ -0,0 +1,10 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/clear.svg b/designer-base/src/main/resources/com/fine/theme/icon/clear.svg new file mode 100644 index 0000000000..b30c3ab503 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/clear.svg @@ -0,0 +1,11 @@ + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/background.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/background.svg new file mode 100755 index 0000000000..97929ef99d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/background.svg @@ -0,0 +1,6 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg new file mode 100644 index 0000000000..f95596d86c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/bold.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/foreground.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground.svg new file mode 100755 index 0000000000..d26f90872b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/foreground.svg @@ -0,0 +1,5 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg new file mode 100755 index 0000000000..5bdf5f2159 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/italic.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg b/designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg new file mode 100755 index 0000000000..d792b37af9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/font/underline.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/bias.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias.svg new file mode 100755 index 0000000000..179e845138 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/bias_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias_disable.svg new file mode 100755 index 0000000000..63fd8e51b4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/bias_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/chart.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart.svg new file mode 100755 index 0000000000..f7ffe73362 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/chart_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart_disable.svg new file mode 100755 index 0000000000..afddb9d68c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/chart_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/formula.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula.svg new file mode 100755 index 0000000000..948234b49c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula.svg @@ -0,0 +1,6 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_disable.svg new file mode 100755 index 0000000000..fe02e3020e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/formula_disable.svg @@ -0,0 +1,6 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/image.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/image.svg new file mode 100755 index 0000000000..bb7fba99a7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/image.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/image_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/image_disable.svg new file mode 100755 index 0000000000..b9be9b7db5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/image_disable.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext.svg new file mode 100755 index 0000000000..5b9a833059 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext_disable.svg new file mode 100755 index 0000000000..2e8c92ed2a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/richtext_disable.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report.svg new file mode 100755 index 0000000000..14f0555a9a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report_disable.svg new file mode 100755 index 0000000000..377745a5a2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/sub_report_disable.svg @@ -0,0 +1,15 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/text.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/text.svg new file mode 100755 index 0000000000..219db75d15 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/text.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/insert/text_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/insert/text_disable.svg new file mode 100755 index 0000000000..0c37c6af50 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/insert/text_disable.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/merge.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge.svg new file mode 100755 index 0000000000..b6cd00a087 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/merge_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge_disable.svg new file mode 100755 index 0000000000..b2cb85a43b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/merge_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.svg new file mode 100755 index 0000000000..5ba0599225 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_disable.svg new file mode 100755 index 0000000000..7917ebc5fb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/merge/unmerge_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/noboder.svg b/designer-base/src/main/resources/com/fine/theme/icon/noboder.svg new file mode 100755 index 0000000000..1fc34c6b0c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/noboder.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/popup/popup.svg b/designer-base/src/main/resources/com/fine/theme/icon/popup/popup.svg new file mode 100755 index 0000000000..b513a4de7f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/popup/popup.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java index 7b7ec644d6..51f556ec2f 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java @@ -3,10 +3,10 @@ */ package com.fr.design.actions.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.base.CellBorderStyle; import com.fr.base.NameStyle; import com.fr.base.Style; -import com.fr.base.svg.IconUtils; import com.fr.design.actions.ElementCaseAction; import com.fr.design.actions.core.ActionFactory; import com.fr.design.mainframe.ElementCasePane; @@ -60,7 +60,7 @@ public class BorderAction extends ElementCaseAction implements ChangeListener { public JComponent createToolBarComponent() { Object object = this.getValue(UIToolbarBorderButton.class.getName()); if (object == null || !(object instanceof UIToolbarBorderButton)) { - UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(IconUtils.readIcon("/com/fr/design/standard/noboder"), this.getEditingComponent()); + UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(new LazyIcon("noboder"), this.getEditingComponent()); this.putValue(UIToolbarBorderButton.class.getName(), borderStylePane); borderStylePane.setEnabled(this.isEnabled()); borderStylePane.set4Toolbar(); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java index 39e3d34266..a5c2c123b1 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java @@ -1,8 +1,7 @@ package com.fr.design.actions.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.base.CellBorderStyle; - -import com.fr.base.svg.IconUtils; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.gui.ibutton.UIButton; @@ -47,7 +46,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH private JPopupMenu popupWin; public UIToolbarBorderButton(Icon icon, ElementCasePane reportPane) { - super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup"))); + super(new UIButton(icon), new UIButton(new LazyIcon("popup"))); this.reportPane = reportPane; } diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java index bcacc413b8..4a87155c26 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/AlignmentAction.java @@ -1,31 +1,29 @@ package com.fr.design.actions.cell.style; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseUtils; import com.fr.base.Style; import com.fr.base.chart.BaseChartCollection; - -import com.fr.base.svg.IconUtils; import com.fr.design.actions.ButtonGroupAction; import com.fr.design.actions.utils.ReportActionUtils; import com.fr.design.constants.UIConstants; import com.fr.design.gui.ibutton.UIButtonGroup; import com.fr.design.mainframe.ElementCasePane; - import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.Selection; import com.fr.report.cell.FloatElement; import com.fr.report.elementcase.TemplateElementCase; import com.fr.stable.Constants; -import javax.swing.*; +import javax.swing.Icon; public class AlignmentAction extends ButtonGroupAction implements StyleActionInterface { private static final Icon[][] ICONS = new Icon[][]{ - {IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_left"), IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_left_selected.svg")}, - {IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_center"), IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_center_selected.svg")}, - {IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_right"), IconUtils.readIcon("/com/fr/design/standard/cellstyle/h_right_selected.svg")}}; + {new LazyIcon("h_left"), new LazyIcon("h_left")}, + {new LazyIcon("h_center"), new LazyIcon("h_center")}, + {new LazyIcon("h_right"), new LazyIcon("h_right")}}; private static final Integer[] valueArray = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java index 906b639d0d..d50a1d2bd3 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java @@ -3,17 +3,16 @@ */ package com.fr.design.actions.cell.style; +import com.fine.theme.icon.LazyIcon; import com.fr.base.Style; import com.fr.base.core.StyleUtils; -import com.fr.base.svg.IconUtils; import com.fr.design.actions.ToggleButtonUpdateAction; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.utils.gui.GUICoreUtils; import com.fr.general.FRFont; - -import javax.swing.*; +import javax.swing.Icon; /** * Bold. @@ -21,7 +20,7 @@ import javax.swing.*; public class ReportFontBoldAction extends AbstractStyleAction implements ToggleButtonUpdateAction { private UIToggleButton button; protected Style style; - private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/standard/bold/bold"), IconUtils.readIcon("/com/fr/design/standard/bold/bold_selected.svg")}; + private final static Icon[] ICONS = {new LazyIcon("bold"), new LazyIcon("bold")}; public ReportFontBoldAction(ElementCasePane t) { super(t); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java index da974e0b4a..c4ee254d2d 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java @@ -3,10 +3,9 @@ */ package com.fr.design.actions.cell.style; +import com.fine.theme.icon.LazyIcon; import com.fr.base.Style; import com.fr.base.core.StyleUtils; - -import com.fr.base.svg.IconUtils; import com.fr.design.actions.core.ActionFactory; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.style.color.UIToolbarColorButton; @@ -51,7 +50,7 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C public JComponent createToolBarComponent() { Object object = this.getValue(UIToolbarColorButton.class.getName()); if (object == null || !(object instanceof UIToolbarColorButton)) { - UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/standard/foreground")); + UIToolbarColorButton tbButton = new UIToolbarColorButton(new LazyIcon("foreground")); this.putValue(UIToolbarColorButton.class.getName(), tbButton); tbButton.set4Toolbar(); tbButton.setEnabled(this.isEnabled()); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java index d1558946f6..9174797735 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java @@ -3,21 +3,20 @@ */ package com.fr.design.actions.cell.style; +import com.fine.theme.icon.LazyIcon; import com.fr.base.Style; import com.fr.base.core.StyleUtils; -import com.fr.base.svg.IconUtils; -import com.fr.general.FRFont; - import com.fr.design.mainframe.ElementCasePane; +import com.fr.general.FRFont; -import javax.swing.*; +import javax.swing.Icon; /** * Bold. */ public class ReportFontItalicAction extends ReportFontBoldAction { - private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/standard/italic/italic"), IconUtils.readIcon("/com/fr/design/standard/italic/italic_selected.svg")}; + private final static Icon[] ICONS = {new LazyIcon("italic"), new LazyIcon("italic")}; public ReportFontItalicAction(ElementCasePane t) { super(t); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java index fdda8dd9cc..a6cb2a09cd 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontUnderlineAction.java @@ -3,22 +3,21 @@ */ package com.fr.design.actions.cell.style; +import com.fine.theme.icon.LazyIcon; import com.fr.base.Style; import com.fr.base.core.StyleUtils; -import com.fr.base.svg.IconUtils; -import com.fr.general.FRFont; - import com.fr.design.mainframe.ElementCasePane; +import com.fr.general.FRFont; import com.fr.stable.Constants; -import javax.swing.*; +import javax.swing.Icon; /** * Bold. */ public class ReportFontUnderlineAction extends ReportFontBoldAction { - private final static Icon[] ICONS = {IconUtils.readIcon("/com/fr/design/standard/underline/underline"), IconUtils.readIcon("/com/fr/design/standard/underline/underline_selected.svg")}; + private final static Icon[] ICONS = {new LazyIcon("underline"), new LazyIcon("underline")}; public ReportFontUnderlineAction(ElementCasePane t) { super(t); diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java index b2b00482c6..597a03fcb6 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java @@ -3,21 +3,18 @@ */ package com.fr.design.actions.cell.style; -import java.awt.Color; - -import javax.swing.JComponent; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; - +import com.fine.theme.icon.LazyIcon; import com.fr.base.Style; import com.fr.base.background.ColorBackground; - -import com.fr.base.svg.IconUtils; import com.fr.design.actions.core.ActionFactory; -import com.fr.general.ComparatorUtils; - import com.fr.design.mainframe.ElementCasePane; import com.fr.design.style.color.UIToolbarColorButton; +import com.fr.general.ComparatorUtils; + +import javax.swing.JComponent; +import javax.swing.event.ChangeEvent; +import javax.swing.event.ChangeListener; +import java.awt.Color; /** * Background. @@ -60,7 +57,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change public JComponent createToolBarComponent() { Object object = this.getValue(UIToolbarColorButton.class.getName()); if (object == null || !(object instanceof UIToolbarColorButton)) { - UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("com/fr/design/standard/background")); + UIToolbarColorButton tbButton = new UIToolbarColorButton(new LazyIcon("background")); tbButton.set4Toolbar(); this.putValue(UIToolbarColorButton.class.getName(), tbButton); diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java index fcf5e2bb2c..7903b68d83 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java @@ -4,9 +4,10 @@ package com.fr.design.actions.edit.merge; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.ElementCaseAction; -import com.fr.design.menu.KeySetUtils; import com.fr.design.mainframe.ElementCasePane; +import com.fr.design.menu.KeySetUtils; /** * merge cell.. @@ -21,7 +22,7 @@ public class MergeCellAction extends ElementCaseAction { this.setMenuKeySet(KeySetUtils.MERGE_CELL); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/merge/merge"); + this.setSmallIcon(new LazyIcon("merge")); } /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java index f2b967925d..d75644b923 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java @@ -4,9 +4,10 @@ package com.fr.design.actions.edit.merge; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.ElementCaseAction; -import com.fr.design.menu.KeySetUtils; import com.fr.design.mainframe.ElementCasePane; +import com.fr.design.menu.KeySetUtils; /** * unmerge cell.. @@ -20,7 +21,7 @@ public class UnmergeCellAction extends ElementCaseAction { this.setMenuKeySet(KeySetUtils.UNMERGE_CELL); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/unmerge/unmerge"); + this.setSmallIcon(new LazyIcon("unmerge")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java index efee97ad25..a9d763ef72 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java @@ -4,10 +4,10 @@ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; - import com.fr.report.cell.painter.BiasTextPainter; import javax.swing.KeyStroke; @@ -30,7 +30,7 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor this.setMenuKeySet(INSERT_SLOPE_LINE); this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/bias/bias"); + this.setSmallIcon(new LazyIcon("bias")); } public static final MenuKeySet INSERT_SLOPE_LINE = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java index 205d39eac3..92b211493c 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java @@ -4,13 +4,13 @@ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.core.ActionFactory; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; - -import javax.swing.*; +import javax.swing.KeyStroke; /** * . @@ -29,7 +29,7 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo this.setMenuKeySet(INSERT_CHART); this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/chart/chart"); + this.setSmallIcon(new LazyIcon("chart")); } public static final MenuKeySet INSERT_CHART = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java index 56d1d8b91d..17b80cb0fe 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java @@ -1,6 +1,7 @@ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.dscolumn.DSColumnPane; import com.fr.design.mainframe.ElementCasePane; @@ -22,7 +23,7 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/bindcolunm/bind_column"); + this.setSmallIcon(new LazyIcon("bind_column")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java index 4cfa7ad740..8def3b526a 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java @@ -3,14 +3,13 @@ */ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseFormula; - import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; - -import javax.swing.*; +import javax.swing.KeyStroke; public class FormulaCellAction extends AbstractCellAction implements WorkBookSupportable { public FormulaCellAction() { @@ -26,7 +25,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup this.setMenuKeySet(INSERT_FORMULA); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/formula/formula"); + this.setSmallIcon(new LazyIcon("formula")); } public static final MenuKeySet INSERT_FORMULA = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java index 8a9832ba07..1b8dc91170 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java @@ -4,12 +4,12 @@ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; - -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; /** @@ -29,7 +29,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup this.setMenuKeySet(INSERT_TEXT); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/text/text"); + this.setSmallIcon(new LazyIcon("text")); } public static final MenuKeySet INSERT_TEXT = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java index 5272909aee..311eb803d9 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java @@ -4,13 +4,13 @@ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; - -import javax.swing.*; -import java.awt.*; +import javax.swing.KeyStroke; +import java.awt.Image; /** * Image @@ -29,7 +29,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo this.setMenuKeySet(INSERT_IMAGE); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/image/image"); + this.setSmallIcon(new LazyIcon("image")); } public static final MenuKeySet INSERT_IMAGE = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java index e33d60d194..cf6ef01c49 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java @@ -1,11 +1,11 @@ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.core.WorkBookSupportable; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; import com.fr.general.ComparatorUtils; - import com.fr.report.cell.cellattr.core.RichText; import javax.swing.KeyStroke; @@ -25,7 +25,7 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu this.setMenuKeySet(INSERT_RICHTEXT); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/richtext/richtext"); + this.setSmallIcon(new LazyIcon("richtext")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java index 9081b67121..0185452389 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java @@ -1,10 +1,10 @@ package com.fr.design.actions.insert.cell; +import com.fine.theme.icon.LazyIcon; import com.fr.design.mainframe.ElementCasePane; import com.fr.design.menu.MenuKeySet; import com.fr.general.ComparatorUtils; - import com.fr.report.cell.cellattr.core.SubReport; import javax.swing.KeyStroke; @@ -24,7 +24,7 @@ public class SubReportCellAction extends AbstractCellAction { this.setMenuKeySet(INSERT_SUB_REPORT); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/standard/subreport/sub_report"); + this.setSmallIcon(new LazyIcon("sub_report")); } public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {