From 764e83f4c95a539e8743d82a677a400a07c3b48f Mon Sep 17 00:00:00 2001 From: Yvan Date: Tue, 22 Dec 2020 11:29:55 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-42238=20=E3=80=9010.0.13=E3=80=91JDK11?= =?UTF-8?q?=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=9B=BE=E6=A0=87=E6=A8=A1=E7=B3=8A?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96=20No.10:=20=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E4=BA=86=E8=AE=BE=E8=AE=A1=E5=99=A8=E8=8F=9C=E5=8D=95?= =?UTF-8?q?=E6=A0=8F-=E6=A8=A1=E6=9D=BF=E4=B8=AD=E7=9A=84=E5=AD=90?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E9=A1=B9=E7=9A=84=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/AllowAuthorityEditAction.java | 6 +++--- .../fr/design/actions/TableDataSourceAction.java | 7 +++---- .../com/fr/design/actions/edit/RedoAction.java | 2 +- .../com/fr/design/actions/edit/UndoAction.java | 2 +- .../fr/design/actions/file/SaveTemplateAction.java | 7 ++++--- .../com/fr/design/images/edit/redo_normal.svg | 7 +++++++ .../com/fr/design/images/edit/undo_normal.svg | 7 +++++++ .../fr/design/images/m_file/pageSetup_normal.svg | 7 +++++++ .../com/fr/design/images/m_file/save_disabled.svg | 11 +++++++++++ .../com/fr/design/images/m_file/save_normal.svg | 11 +++++++++++ .../m_report/allow_authority_edit_normal.svg | 8 ++++++++ .../design/images/m_report/background_normal.svg | 10 ++++++++++ .../images/m_report/exit_authority_edit_normal.svg | 8 ++++++++ .../fr/design/images/m_report/footer_normal.svg | 7 +++++++ .../fr/design/images/m_report/header_normal.svg | 7 +++++++ .../design/images/m_report/linear_attr_normal.svg | 7 +++++++ .../images/m_report/parameter_report_normal.svg | 7 +++++++ .../images/m_report/report_engine_attr_normal.svg | 14 ++++++++++++++ .../images/m_report/report_write_attr_normal.svg | 11 +++++++++++ .../fr/design/images/m_report/watermark_normal.svg | 7 +++++++ .../m_report/web_report_attribute_normal.svg | 8 ++++++++ .../fr/design/images/m_web/datasource_normal.svg | 9 +++++++++ .../actions/report/ReportBackgroundAction.java | 7 +++---- .../design/actions/report/ReportColumnsAction.java | 6 +++--- .../actions/report/ReportEngineAttrAction.java | 6 +++--- .../actions/report/ReportExportAttrAction.java | 8 ++++---- .../design/actions/report/ReportFooterAction.java | 6 +++--- .../design/actions/report/ReportHeaderAction.java | 6 +++--- .../actions/report/ReportPageSetupAction.java | 7 ++++--- .../actions/report/ReportParameterAction.java | 6 +++--- .../actions/report/ReportPrintSettingAction.java | 5 ++--- .../actions/report/ReportWatermarkAction.java | 4 ++-- .../design/actions/report/ReportWebAttrAction.java | 8 ++++---- .../actions/report/ReportWriteAttrAction.java | 5 +++-- .../java/com/fr/start/preload/ImagePreLoader.java | 14 ++++++++++++++ 35 files changed, 209 insertions(+), 49 deletions(-) create mode 100644 designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/linear_attr_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/parameter_report_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/report_engine_attr_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/report_write_attr_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_report/web_report_attribute_normal.svg create mode 100644 designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg diff --git a/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java b/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java index 507632c72..49e8670bd 100644 --- a/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/AllowAuthorityEditAction.java @@ -1,6 +1,6 @@ package com.fr.design.actions; -import com.fr.base.BaseUtils; +import com.fr.base.svg.SVGIcon; import com.fr.base.vcs.DesignerMode; import com.fr.design.constants.UIConstants; import com.fr.design.menu.KeySetUtils; @@ -22,7 +22,7 @@ public class AllowAuthorityEditAction extends TemplateComponentAction { this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/allow_authority_edit.png")); + this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/allow_authority_edit_normal.svg")); } /** @@ -78,4 +78,4 @@ public class AllowAuthorityEditAction extends TemplateComponentAction { } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java index a0ca4d955..74c4f1e76 100644 --- a/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/TableDataSourceAction.java @@ -1,8 +1,7 @@ package com.fr.design.actions; import javax.swing.SwingUtilities; - -import com.fr.base.BaseUtils; +import com.fr.base.svg.SVGIcon; import com.fr.design.data.DesignTableDataManager; import com.fr.data.TableDataSource; import com.fr.design.data.datapane.ReportTableDataPane; @@ -27,7 +26,7 @@ public class TableDataSourceAction extends TemplateComponentAction map) { DesignTableDataManager.fireDSChanged(map); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java index 4ed649dc2..dca023a4e 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java @@ -23,7 +23,7 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI this.setMenuKeySet(KeySetUtils.REDO); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/redo_normal.svg")); + this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/edit/redo_normal.svg")); this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/redo_disabled.svg")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java index 4faedd6ac..200bc8ae4 100644 --- a/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java @@ -23,7 +23,7 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI this.setMenuKeySet(KeySetUtils.UNDO); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/undo_normal.svg")); + this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/edit/undo_normal.svg")); this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/undo_disabled.svg")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java b/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java index de2cf1e42..d6be9b618 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SaveTemplateAction.java @@ -5,7 +5,7 @@ package com.fr.design.actions.file; import java.awt.event.ActionEvent; -import com.fr.base.BaseUtils; +import com.fr.base.svg.SVGIcon; import com.fr.design.actions.JTemplateAction; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; @@ -21,7 +21,8 @@ public class SaveTemplateAction extends JTemplateAction> { this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/save.png")); + this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/save_normal.svg")); + this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/save_disabled.svg")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } @@ -42,4 +43,4 @@ public class SaveTemplateAction extends JTemplateAction> { this.setEnabled(!this.getEditingComponent().isSaved()); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg new file mode 100644 index 000000000..6723f533a --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/edit/redo_normal.svg @@ -0,0 +1,7 @@ + + + icon_重做_下拉列表用 + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg new file mode 100644 index 000000000..f66553747 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/edit/undo_normal.svg @@ -0,0 +1,7 @@ + + + icon_撤销_下拉列表用 + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg new file mode 100644 index 000000000..565fc0aee --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/pageSetup_normal.svg @@ -0,0 +1,7 @@ + + + icon_页面设置_normal + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg new file mode 100644 index 000000000..7158a2c9f --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/save_disabled.svg @@ -0,0 +1,11 @@ + + + icon_save_disable + + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg new file mode 100644 index 000000000..6da2e13e8 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_file/save_normal.svg @@ -0,0 +1,11 @@ + + + icon_save_normal + + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg new file mode 100644 index 000000000..9d8bff279 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/allow_authority_edit_normal.svg @@ -0,0 +1,8 @@ + + + icon_进入权限编辑_normal + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg new file mode 100644 index 000000000..4cacc0f6d --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/background_normal.svg @@ -0,0 +1,10 @@ + + + icon_纸张背景_normal + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg new file mode 100644 index 000000000..1897f7488 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/exit_authority_edit_normal.svg @@ -0,0 +1,8 @@ + + + icon_关闭_权限编辑_normal + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg new file mode 100644 index 000000000..a9ebb2515 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/footer_normal.svg @@ -0,0 +1,7 @@ + + + icon_页脚_normal + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg new file mode 100644 index 000000000..5a4073df1 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/header_normal.svg @@ -0,0 +1,7 @@ + + + icon_页眉_normal + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/linear_attr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/linear_attr_normal.svg new file mode 100644 index 000000000..35c6a92e3 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/linear_attr_normal.svg @@ -0,0 +1,7 @@ + + + icon_报表分栏_normal + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/parameter_report_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/parameter_report_normal.svg new file mode 100644 index 000000000..326b33cf3 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/parameter_report_normal.svg @@ -0,0 +1,7 @@ + + + icon_参数 模板参数_normal + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/report_engine_attr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/report_engine_attr_normal.svg new file mode 100644 index 000000000..b9d5b48bd --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/report_engine_attr_normal.svg @@ -0,0 +1,14 @@ + + + icon_报表引擎属性_normal + + + + + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/report_write_attr_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/report_write_attr_normal.svg new file mode 100644 index 000000000..d70ac6e2c --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/report_write_attr_normal.svg @@ -0,0 +1,11 @@ + + + icon_报表填报属性_normal + + + + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg new file mode 100644 index 000000000..52b0581e8 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/watermark_normal.svg @@ -0,0 +1,7 @@ + + + icon_水印_normal + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/web_report_attribute_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/web_report_attribute_normal.svg new file mode 100644 index 000000000..f1929fd4f --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_report/web_report_attribute_normal.svg @@ -0,0 +1,8 @@ + + + icon_模板web属性_normal + + + + + \ No newline at end of file diff --git a/designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg new file mode 100644 index 000000000..626af16f0 --- /dev/null +++ b/designer-base/src/main/resources/com/fr/design/images/m_web/datasource_normal.svg @@ -0,0 +1,9 @@ + + + icon_模板数据集_normal + + + + + + \ No newline at end of file diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java index 1a07b2a2d..706cf905d 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportBackgroundAction.java @@ -3,9 +3,8 @@ */ package com.fr.design.actions.report; -import com.fr.base.BaseUtils; +import com.fr.base.svg.SVGIcon; import com.fr.design.actions.ReportComponentAction; -import com.fr.design.dialog.BasicDialog; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.ReportComponent; import com.fr.design.menu.KeySetUtils; @@ -23,7 +22,7 @@ public class ReportBackgroundAction extends ReportComponentAction { @@ -17,7 +17,7 @@ public class ReportEngineAttrAction extends ReportComponentAction { this.setMenuKeySet(KeySetUtils.REPORT_FOOTER); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/footer.png")); + this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/footer_normal.svg")); } /** @@ -88,4 +88,4 @@ public class ReportFooterAction extends ReportComponentAction { } } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java index 5ee5c9792..eccee9e26 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportHeaderAction.java @@ -3,7 +3,7 @@ */ package com.fr.design.actions.report; -import com.fr.base.BaseUtils; +import com.fr.base.svg.SVGIcon; import com.fr.design.actions.ReportComponentAction; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.headerfooter.EditHeaderPane; @@ -32,7 +32,7 @@ public class ReportHeaderAction extends ReportComponentAction { this.setMenuKeySet(KeySetUtils.REPORT_HEADER); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/header.png")); + this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/header_normal.svg")); } /** @@ -90,4 +90,4 @@ public class ReportHeaderAction extends ReportComponentAction { } } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java index b6d831cf6..39d8faf74 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageSetupAction.java @@ -3,6 +3,7 @@ */ package com.fr.design.actions.report; +import com.fr.base.svg.SVGIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.ReportComponentAction; import com.fr.design.dialog.BasicDialog; @@ -27,10 +28,10 @@ public class ReportPageSetupAction extends ReportComponentAction