From ba45e6c59554401416a15410c140743644ee57ff Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Wed, 10 Jan 2024 20:22:37 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=20REPORT-107973=20=E6=9B=BF=E6=8D=A2?= =?UTF-8?q?=E5=B7=A5=E5=85=B7=E6=A0=8F=E5=9B=BE=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fine/theme/light/ui/FineLightIconSet.java | 56 +++++++++++++++++++ .../actions/AllowAuthorityEditAction.java | 12 ++-- .../design/actions/TableDataSourceAction.java | 14 ++--- .../design/actions/community/BBSAction.java | 3 +- .../design/actions/community/BugAction.java | 3 +- .../actions/community/BugNeedAction.java | 6 +- .../actions/community/CenterAction.java | 2 +- .../design/actions/community/NeedAction.java | 3 +- .../actions/community/QuestionAction.java | 3 +- .../design/actions/community/SignAction.java | 3 +- .../actions/community/StudyPlanAction.java | 3 +- .../actions/community/TechSolutionAction.java | 3 +- .../community/TemplateStoreAction.java | 4 +- .../design/actions/community/VideoAction.java | 5 +- .../community/WorkOrderCenterAction.java | 3 +- .../fr/design/actions/edit/RedoAction.java | 7 ++- .../fr/design/actions/edit/UndoAction.java | 6 +- .../actions/file/OpenTemplateAction.java | 8 +-- .../actions/file/SaveAsTemplateAction.java | 8 +-- .../actions/file/SaveTemplateAction.java | 7 ++- .../design/actions/file/SwitchExistEnv.java | 3 +- .../design/actions/help/TutorialAction.java | 3 +- .../fr/design/actions/help/WebDemoAction.java | 7 +-- .../help/alphafine/AlphaFineAction.java | 4 +- .../actions/server/ConnectionListAction.java | 7 ++- .../actions/server/FunctionManagerAction.java | 7 +-- .../actions/server/GlobalParameterAction.java | 5 +- .../actions/server/GlobalTableDataAction.java | 4 +- .../actions/server/PlatformManagerAction.java | 5 +- .../actions/server/PluginManagerAction.java | 6 +- .../platform/ServicePlatformAction.java | 6 +- .../fit/menupane/ReportFitAttrAction.java | 3 +- .../update/actions/SoftwareUpdateAction.java | 4 +- .../fr/env/detect/ui/EnvDetectorAction.java | 3 +- .../designer/WidgetThemeDisplayAction.java | 6 +- .../com/fine/theme/icon/toolbar/actCenter.svg | 5 ++ .../theme/icon/toolbar/actCenter_disable.svg | 5 ++ .../theme/icon/toolbar/allowAuthorityEdit.svg | 24 ++++++++ .../toolbar/allowAuthorityEdit_disable.svg | 24 ++++++++ .../com/fine/theme/icon/toolbar/bbs.svg | 5 ++ .../fine/theme/icon/toolbar/bbs_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/bug.svg | 5 ++ .../fine/theme/icon/toolbar/bug_disable.svg | 5 ++ .../fine/theme/icon/toolbar/charMapData.svg | 11 ++++ .../icon/toolbar/charMapData_disable.svg | 11 ++++ .../icon/toolbar/chartEmptyDataStyle.svg | 5 ++ .../toolbar/chartEmptyDataStyle_disable.svg | 5 ++ .../fine/theme/icon/toolbar/chartPreStyle.svg | 11 ++++ .../icon/toolbar/chartPreStyle_disable.svg | 11 ++++ .../com/fine/theme/icon/toolbar/createCpt.svg | 11 ++++ .../theme/icon/toolbar/createCpt_disable.svg | 11 ++++ .../fine/theme/icon/toolbar/createOther.svg | 13 +++++ .../icon/toolbar/createOther_disable.svg | 13 +++++ .../fine/theme/icon/toolbar/datasource.svg | 5 ++ .../theme/icon/toolbar/datasource_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/demo.svg | 5 ++ .../fine/theme/icon/toolbar/demo_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/envDetect.svg | 5 ++ .../theme/icon/toolbar/envDetect_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/export.svg | 5 ++ .../theme/icon/toolbar/export_disable.svg | 5 ++ .../theme/icon/toolbar/functionManager.svg | 5 ++ .../icon/toolbar/functionManager_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/help.svg | 5 ++ .../fine/theme/icon/toolbar/help_disable.svg | 5 ++ .../fine/theme/icon/toolbar/linearAttr.svg | 11 ++++ .../theme/icon/toolbar/linearAttr_disable.svg | 11 ++++ .../fine/theme/icon/toolbar/mobileAttr.svg | 5 ++ .../theme/icon/toolbar/mobileAttr_disable.svg | 5 ++ .../icon/toolbar/monochromeServerDatabase.svg | 5 ++ .../monochromeServerDatabase_disable.svg | 5 ++ .../theme/icon/toolbar/monochrome_redo.svg | 5 ++ .../icon/toolbar/monochrome_redo_disable.svg | 5 ++ .../theme/icon/toolbar/monochrome_undo.svg | 5 ++ .../icon/toolbar/monochrome_undo_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/need.svg | 11 ++++ .../fine/theme/icon/toolbar/need_disable.svg | 11 ++++ .../fine/theme/icon/toolbar/openTemplate.svg | 5 ++ .../icon/toolbar/openTemplate_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/pageSetup.svg | 5 ++ .../theme/icon/toolbar/pageSetup_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/platform.svg | 5 ++ .../theme/icon/toolbar/platform_disable.svg | 5 ++ .../fine/theme/icon/toolbar/pluginManager.svg | 8 +++ .../icon/toolbar/pluginManager_disable.svg | 8 +++ .../com/fine/theme/icon/toolbar/print.svg | 4 ++ .../fine/theme/icon/toolbar/print_disable.svg | 4 ++ .../com/fine/theme/icon/toolbar/question.svg | 7 +++ .../theme/icon/toolbar/question_disable.svg | 7 +++ .../theme/icon/toolbar/repeatAndFrozen.svg | 5 ++ .../icon/toolbar/repeatAndFrozen_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/replace.svg | 5 ++ .../theme/icon/toolbar/replace_disable.svg | 5 ++ .../theme/icon/toolbar/reportBackground.svg | 5 ++ .../icon/toolbar/reportBackground_disable.svg | 5 ++ .../theme/icon/toolbar/reportEngineAttr.svg | 14 +++++ .../icon/toolbar/reportEngineAttr_disable.svg | 14 +++++ .../com/fine/theme/icon/toolbar/reportFit.svg | 5 ++ .../theme/icon/toolbar/reportFit_disable.svg | 5 ++ .../fine/theme/icon/toolbar/reportFooter.svg | 9 +++ .../icon/toolbar/reportFooter_disable.svg | 9 +++ .../fine/theme/icon/toolbar/reportHeader.svg | 9 +++ .../icon/toolbar/reportHeader_disable.svg | 9 +++ .../theme/icon/toolbar/reportParameter.svg | 11 ++++ .../icon/toolbar/reportParameter_disable.svg | 11 ++++ .../theme/icon/toolbar/reportWriteAttr.svg | 5 ++ .../icon/toolbar/reportWriteAttr_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/saveAs.svg | 5 ++ .../theme/icon/toolbar/saveAs_disable.svg | 5 ++ .../icon/toolbar/serverConfigManager.svg | 12 ++++ .../toolbar/serverConfigManager_disable.svg | 12 ++++ .../com/fine/theme/icon/toolbar/sign.svg | 14 +++++ .../fine/theme/icon/toolbar/sign_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/solution.svg | 5 ++ .../theme/icon/toolbar/solution_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/studyPlan.svg | 5 ++ .../theme/icon/toolbar/studyPlan_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/switchEnv.svg | 5 ++ .../theme/icon/toolbar/switchEnv_disable.svg | 5 ++ .../fine/theme/icon/toolbar/templateStore.svg | 5 ++ .../icon/toolbar/templateStore_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/update.svg | 5 ++ .../theme/icon/toolbar/update_disable.svg | 5 ++ .../com/fine/theme/icon/toolbar/video.svg | 7 +++ .../fine/theme/icon/toolbar/video_disable.svg | 7 +++ .../com/fine/theme/icon/toolbar/watermark.svg | 5 ++ .../theme/icon/toolbar/watermark_disable.svg | 5 ++ .../theme/icon/toolbar/webReportAttribute.svg | 5 ++ .../toolbar/webReportAttribute_disable.svg | 5 ++ .../fine/theme/icon/toolbar/widgetManager.svg | 7 +++ .../icon/toolbar/widgetManager_disable.svg | 7 +++ .../theme/icon/toolbar/widgetThemeMenu.svg | 18 ++++++ .../icon/toolbar/widgetThemeMenu_disable.svg | 18 ++++++ .../theme/icon/toolbar/workOrderCenter.svg | 5 ++ .../icon/toolbar/workOrderCenter_disable.svg | 5 ++ .../module/ChartEmptyDataStyleAction.java | 4 +- .../fr/design/module/ChartPreStyleAction.java | 6 +- .../map/server/ChartMapEditorAction.java | 5 +- .../actions/file/export/PDFExportAction.java | 4 +- .../actions/file/export/WordExportAction.java | 4 +- .../file/newReport/NewWorkBookAction.java | 5 +- .../actions/insert/flot/ChartFloatAction.java | 4 +- .../insert/flot/FormulaFloatAction.java | 3 +- .../actions/insert/flot/ImageFloatAction.java | 5 +- .../insert/flot/TextBoxFloatAction.java | 3 +- .../actions/replace/ITReplaceAction.java | 12 ++-- .../report/ReportBackgroundAction.java | 4 +- .../actions/report/ReportColumnsAction.java | 6 +- .../report/ReportEngineAttrAction.java | 3 +- .../report/ReportExportAttrAction.java | 4 +- .../actions/report/ReportFooterAction.java | 4 +- .../actions/report/ReportHeaderAction.java | 4 +- .../report/ReportMobileAttrAction.java | 7 +-- .../actions/report/ReportPageAttrAction.java | 4 +- .../actions/report/ReportPageSetupAction.java | 6 +- .../actions/report/ReportParameterAction.java | 4 +- .../report/ReportPrintSettingAction.java | 6 +- .../actions/report/ReportWatermarkAction.java | 3 +- .../actions/report/ReportWebAttrAction.java | 4 +- .../actions/report/ReportWriteAttrAction.java | 4 +- .../server/ServerConfigManagerAction.java | 8 +-- .../actions/server/WidgetManagerAction.java | 3 +- .../com/fr/design/mainframe/JWorkBook.java | 4 +- .../main/java/com/fr/start/MainDesigner.java | 2 +- 164 files changed, 940 insertions(+), 152 deletions(-) create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/export.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/export_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/help.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/help_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/need.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/need_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/print.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/print_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/question.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/question_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter_disable.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader.svg create mode 100755 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/update.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/update_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/video.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/video_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu_disable.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter.svg create mode 100644 designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter_disable.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 f61f362788..2409e92464 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 @@ -189,8 +189,64 @@ public class FineLightIconSet extends AbstractIconSet { new SvgIconSource("param", "com/fine/theme/icon/param/param.svg", true), // 北区菜单栏 + //文件 new SvgIconSource("notification", "com/fine/theme/icon/notification/notification.svg"), new SvgIconSource("notification_dot", "com/fine/theme/icon/notification/notification_dot.svg"), + new SvgIconSource("createCpt", "com/fine/theme/icon/toolbar/createCpt.svg", true), + new SvgIconSource("createOther", "com/fine/theme/icon/toolbar/createOther.svg", true), + new SvgIconSource("openTemplate", "com/fine/theme/icon/toolbar/openTemplate.svg", true), + new SvgIconSource("switchEnv", "com/fine/theme/icon/toolbar/switchEnv.svg", true), + new SvgIconSource("export", "com/fine/theme/icon/toolbar/export.svg", true), + new SvgIconSource("monochrome_undo", "com/fine/theme/icon/toolbar/monochrome_undo.svg", true), + new SvgIconSource("monochrome_redo", "com/fine/theme/icon/toolbar/monochrome_redo.svg", true), + new SvgIconSource("saveAs", "com/fine/theme/icon/toolbar/saveAs.svg", true), + // 模板 + new SvgIconSource("widgetThemeMenu", "com/fine/theme/icon/toolbar/widgetThemeMenu.svg", true), + new SvgIconSource("datasource", "com/fine/theme/icon/toolbar/datasource.svg", true), + new SvgIconSource("webReportAttribute", "com/fine/theme/icon/toolbar/webReportAttribute.svg", true), + new SvgIconSource("reportParameter", "com/fine/theme/icon/toolbar/reportParameter.svg", true), + new SvgIconSource("reportFit", "com/fine/theme/icon/toolbar/reportFit.svg", true), + new SvgIconSource("mobileAttr", "com/fine/theme/icon/toolbar/mobileAttr.svg", true), + new SvgIconSource("watermark", "com/fine/theme/icon/toolbar/watermark.svg", true), + new SvgIconSource("print", "com/fine/theme/icon/toolbar/print.svg", true), + new SvgIconSource("pageSetup", "com/fine/theme/icon/toolbar/pageSetup.svg", true), + new SvgIconSource("reportHeader", "com/fine/theme/icon/toolbar/reportHeader.svg", true), + new SvgIconSource("reportFooter", "com/fine/theme/icon/toolbar/reportFooter.svg", true), + new SvgIconSource("reportBackground", "com/fine/theme/icon/toolbar/reportBackground.svg", true), + new SvgIconSource("reportWriteAttr", "com/fine/theme/icon/toolbar/reportWriteAttr.svg", true), + new SvgIconSource("linearAttr", "com/fine/theme/icon/toolbar/linearAttr.svg", true), + new SvgIconSource("repeatAndFrozen", "com/fine/theme/icon/toolbar/repeatAndFrozen.svg", true), + new SvgIconSource("reportEngineAttr", "com/fine/theme/icon/toolbar/reportEngineAttr.svg", true), + new SvgIconSource("allowAuthorityEdit", "com/fine/theme/icon/toolbar/allowAuthorityEdit.svg", true), + new SvgIconSource("replace", "com/fine/theme/icon/toolbar/replace.svg", true), + // 服务器 + new SvgIconSource("monochromeServerDatabase", "com/fine/theme/icon/toolbar/monochromeServerDatabase.svg", true), + new SvgIconSource("platform", "com/fine/theme/icon/toolbar/platform.svg", true), + new SvgIconSource("pluginManager", "com/fine/theme/icon/toolbar/pluginManager.svg", true), + new SvgIconSource("functionManager", "com/fine/theme/icon/toolbar/functionManager.svg", true), + new SvgIconSource("serverConfigManager", "com/fine/theme/icon/toolbar/serverConfigManager.svg", true), + new SvgIconSource("widgetManager", "com/fine/theme/icon/toolbar/widgetManager.svg", true), + new SvgIconSource("chartPreStyle", "com/fine/theme/icon/toolbar/chartPreStyle.svg", true), + new SvgIconSource("chartEmptyDataStyle", "com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg", true), + new SvgIconSource("charMapData", "com/fine/theme/icon/toolbar/charMapData.svg", true), + // 帮助 + new SvgIconSource("demo", "com/fine/theme/icon/toolbar/demo.svg", true), + new SvgIconSource("update", "com/fine/theme/icon/toolbar/update.svg", true), + new SvgIconSource("envDetect", "com/fine/theme/icon/toolbar/envDetect.svg", true), + new SvgIconSource("servicePlatform", "com/fine/theme/icon/toolbar/servicePlatform.svg", true), + // 社区 + new SvgIconSource("bbs", "com/fine/theme/icon/toolbar/bbs.svg", true), + new SvgIconSource("video", "com/fine/theme/icon/toolbar/video.svg", true), + new SvgIconSource("help", "com/fine/theme/icon/toolbar/help.svg", true), + new SvgIconSource("studyPlan", "com/fine/theme/icon/toolbar/studyPlan.svg", true), + new SvgIconSource("question", "com/fine/theme/icon/toolbar/question.svg", true), + new SvgIconSource("solution", "com/fine/theme/icon/toolbar/solution.svg", true), + new SvgIconSource("templateStore", "com/fine/theme/icon/toolbar/templateStore.svg", true), + new SvgIconSource("bug", "com/fine/theme/icon/toolbar/bug.svg", true), + new SvgIconSource("need", "com/fine/theme/icon/toolbar/need.svg", true), + new SvgIconSource("workOrderCenter", "com/fine/theme/icon/toolbar/workOrderCenter.svg", true), + new SvgIconSource("actCenter", "com/fine/theme/icon/toolbar/actCenter.svg", true), + new SvgIconSource("sign", "com/fine/theme/icon/toolbar/sign.svg", true), //东区面板 new SvgIconSource("cellelement_small", "com/fine/theme/icon/cellelement.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 546a702979..7d5deaa066 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,14 +1,18 @@ package com.fr.design.actions; +import com.fine.theme.icon.LazyIcon; import com.fr.base.vcs.DesignerMode; import com.fr.design.constants.UIConstants; +import com.fr.design.designer.TargetComponent; +import com.fr.design.file.HistoryTemplateListPane; +import com.fr.design.mainframe.DesignerContext; +import com.fr.design.mainframe.EastRegionContainerPane; +import com.fr.design.mainframe.JTemplate; +import com.fr.design.mainframe.WestRegionContainerPane; import com.fr.design.menu.KeySetUtils; import com.fr.design.module.DesignModuleFactory; import com.fr.design.roleAuthority.ReportAndFSManagePane; import com.fr.design.roleAuthority.RolesAlreadyEditedPane; -import com.fr.design.designer.TargetComponent; -import com.fr.design.file.HistoryTemplateListPane; -import com.fr.design.mainframe.*; /** * Author : daisy @@ -22,7 +26,7 @@ public class AllowAuthorityEditAction extends TemplateComponentAction { this.setMenuKeySet(KeySetUtils.ALLOW_AUTHORITY_EDIT); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_report/allow_authority_edit"); + this.setSmallIcon(new LazyIcon("allowAuthorityEdit")); } /** 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 8a6e7a7df9..dbc72adbd7 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,18 +1,18 @@ package com.fr.design.actions; -import javax.swing.SwingUtilities; -import com.fr.base.svg.IconUtils; -import com.fr.design.data.DesignTableDataManager; +import com.fine.theme.icon.LazyIcon; import com.fr.data.TableDataSource; +import com.fr.design.DesignModelAdapter; +import com.fr.design.data.DesignTableDataManager; import com.fr.design.data.datapane.ReportTableDataPane; import com.fr.design.data.datapane.TableDataTreePane; import com.fr.design.data.tabledata.ResponseDataSourceChange; -import com.fr.design.DesignModelAdapter; -import com.fr.design.mainframe.JTemplate; -import com.fr.design.menu.KeySetUtils; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; +import com.fr.design.mainframe.JTemplate; +import com.fr.design.menu.KeySetUtils; +import javax.swing.SwingUtilities; import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -26,7 +26,7 @@ public class TableDataSourceAction extends TemplateComponentAction> { this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_file/saveAs"); + this.setSmallIcon(new LazyIcon("saveAs")); } /** 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 072a127aa9..9883034746 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 @@ -3,12 +3,13 @@ */ package com.fr.design.actions.file; -import java.awt.event.ActionEvent; - +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.JTemplateAction; import com.fr.design.mainframe.JTemplate; import com.fr.design.menu.KeySetUtils; +import java.awt.event.ActionEvent; + /** * @author richer * @since 6.5.3 @@ -20,7 +21,7 @@ public class SaveTemplateAction extends JTemplateAction> { this.setMenuKeySet(KeySetUtils.SAVE_TEMPLATE); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_file/save"); + this.setSmallIcon(new LazyIcon("save")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index 1a421c5fd0..accb907e20 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -1,5 +1,6 @@ package com.fr.design.actions.file; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.EnvChangeEntrance; import com.fr.design.actions.UpdateAction; @@ -28,7 +29,7 @@ public class SwitchExistEnv extends MenuDef { Iterator nameIt = DesignerEnvManager.getEnvManager().getEnvNameIterator(); while (nameIt.hasNext()) { String name = nameIt.next(); - this.setIconPath("com/fr/design/images/m_file/switch"); + this.setIcon(new LazyIcon("switchEnv")); this.addShortCut(new GetExistEnvAction(name)); } this.addShortCut(SeparatorDef.DEFAULT); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java index 1a4bccfa4a..9c0e7ebdab 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/TutorialAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.help; +import com.fine.theme.icon.LazyIcon; import com.fr.design.i18n.LocaleLinkProvider; import com.fr.design.i18n.Toolkit; import com.fr.design.login.AbstractDesignerSSO; @@ -32,7 +33,7 @@ public class TutorialAction extends AbstractDesignerSSO { this.setMenuKeySet(HELP_TUTORIAL); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/bbs/help"); + this.setSmallIcon(new LazyIcon("help")); this.setAccelerator(getMenuKeySet().getKeyStroke()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java b/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java index 53ef796b34..4ba2a02926 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/WebDemoAction.java @@ -1,13 +1,12 @@ package com.fr.design.actions.help; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; - import com.fr.start.ServerStarter; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -16,7 +15,7 @@ public class WebDemoAction extends UpdateAction { this.setMenuKeySet(PRODUCT_DEMO); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_help/demo"); + this.setSmallIcon(new LazyIcon("demo")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java index 3dc951578a..ef4754c6a1 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineAction.java @@ -1,6 +1,6 @@ package com.fr.design.actions.help.alphafine; -import com.fr.base.svg.SVGIcon; +import com.fine.theme.icon.LazyIcon; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; @@ -21,7 +21,7 @@ public class AlphaFineAction extends UpdateAction { this.setMenuKeySet(ALPHAFINE); this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("com/fr/design/mainframe/alphafine/images/smallsearch"); + this.setSmallIcon(new LazyIcon("search")); this.generateAndSetSearchText(AlphaFineConfigPane.class.getName()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java index 4742f337cd..216d7dd8ad 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/ConnectionListAction.java @@ -1,5 +1,6 @@ package com.fr.design.actions.server; +import com.fine.theme.icon.LazyIcon; import com.fr.data.impl.Connection; import com.fr.design.actions.UpdateAction; import com.fr.design.data.datapane.connect.ConnectionShowPane; @@ -11,11 +12,11 @@ import com.fr.design.gui.NameInspector; import com.fr.design.gui.imenu.UILockMenuItem; import com.fr.design.gui.imenu.UIMenuItem; import com.fr.design.menu.MenuKeySet; -import com.fr.stable.os.support.OSBasedAction; -import com.fr.stable.os.support.OSSupportCenter; import com.fr.design.os.impl.DatabaseDialogAction; import com.fr.file.ConnectionConfig; import com.fr.report.LockItem; +import com.fr.stable.os.support.OSBasedAction; +import com.fr.stable.os.support.OSSupportCenter; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -30,7 +31,7 @@ public class ConnectionListAction extends UpdateAction { this.setMenuKeySet(DEFINE_DATA_CONNECTION); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_web/connection"); + this.setSmallIcon(new LazyIcon("connection")); this.generateAndSetSearchText(DatabaseConnectionPane.JDBC.class.getName()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java index d7f1cdbb7a..4cd2d78182 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/FunctionManagerAction.java @@ -4,7 +4,7 @@ package com.fr.design.actions.server; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.config.Configuration; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; @@ -13,11 +13,10 @@ import com.fr.design.formula.FunctionManagerPane; import com.fr.design.mainframe.DesignerContext; import com.fr.design.menu.MenuKeySet; import com.fr.file.FunctionConfig; - import com.fr.transaction.Configurations; import com.fr.transaction.Worker; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -29,7 +28,7 @@ public class FunctionManagerAction extends UpdateAction { this.setMenuKeySet(FUNCTION_MANAGER); this.setName(getMenuKeySet().getMenuKeySetName()+"..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_web/function"); + this.setSmallIcon(new LazyIcon("functionManager")); this.generateAndSetSearchText(FunctionManagerPane.class.getName()); } diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java index d3f035972c..d713b71ea3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalParameterAction.java @@ -3,8 +3,8 @@ */ package com.fr.design.actions.server; +import com.fine.theme.icon.LazyIcon; import com.fr.base.ParameterConfig; -import com.fr.base.svg.IconUtils; import com.fr.config.ServerPreferenceConfig; import com.fr.design.DesignModelAdapter; import com.fr.design.actions.UpdateAction; @@ -14,7 +14,6 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; import com.fr.design.menu.MenuKeySet; import com.fr.design.parameter.ParameterManagerPane; - import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; @@ -31,7 +30,7 @@ public class GlobalParameterAction extends UpdateAction { this.setMenuKeySet(GLOBAL_PARAMETER); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_report/p"); + this.setSmallIcon(new LazyIcon("reportParameter")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java index 1457f0d111..c2c6d64b79 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/GlobalTableDataAction.java @@ -3,6 +3,7 @@ */ package com.fr.design.actions.server; +import com.fine.theme.icon.LazyIcon; import com.fr.base.TableData; import com.fr.design.DesignModelAdapter; import com.fr.design.actions.UpdateAction; @@ -24,7 +25,6 @@ import com.fr.esd.event.DSMapping; import com.fr.esd.event.DsNameTarget; import com.fr.esd.event.StrategyEventsNotifier; import com.fr.file.TableDataConfig; - import com.fr.report.LockItem; import javax.swing.KeyStroke; @@ -44,7 +44,7 @@ public class GlobalTableDataAction extends UpdateAction implements ResponseDataS this.setMenuKeySet(SERVER_TABLEDATA); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/data/dock/serverdatabase"); + this.setSmallIcon(new LazyIcon("monochromeServerDatabase")); } public static final MenuKeySet SERVER_TABLEDATA = new MenuKeySet() { diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java index f62327ad9a..d1e2f6f52d 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/PlatformManagerAction.java @@ -1,12 +1,9 @@ package com.fr.design.actions.server; -import com.fr.base.svg.IconUtils; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.design.utils.DesignUtils; - -import javax.swing.*; import java.awt.event.ActionEvent; public class PlatformManagerAction extends UpdateAction { @@ -14,7 +11,7 @@ public class PlatformManagerAction extends UpdateAction { this.setMenuKeySet(PLATEFORM_MANAGER); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/server/platform_16_16"); + this.setSmallIcon(new LazyIcon("platform")); } /** diff --git a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java index bb9339568c..1f3f0d6045 100644 --- a/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/actions/server/PluginManagerAction.java @@ -1,13 +1,13 @@ package com.fr.design.actions.server; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.menu.MenuKeySet; import com.fr.design.os.impl.PMDialogAction; import com.fr.stable.os.support.OSBasedAction; import com.fr.stable.os.support.OSSupportCenter; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; /** @@ -20,7 +20,7 @@ public class PluginManagerAction extends UpdateAction { this.setMenuKeySet(PLUGIN_MANAGER); this.setName(getMenuKeySet().getMenuKeySetName()); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/server/plugin"); + this.setSmallIcon(new LazyIcon("pluginManager")); } @Override public void actionPerformed(ActionEvent e) { diff --git a/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java b/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java index c6dc9a9b66..bff60f71d2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/platform/ServicePlatformAction.java @@ -1,14 +1,12 @@ package com.fr.design.mainframe.platform; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.i18n.Toolkit; import com.fr.design.utils.BrowseUtils; import com.fr.general.CloudCenter; -import com.fr.log.FineLoggerFactory; -import java.awt.Desktop; import java.awt.event.ActionEvent; -import java.net.URI; /** * 帮助-服务平台 @@ -20,7 +18,7 @@ import java.net.URI; public class ServicePlatformAction extends UpdateAction { public ServicePlatformAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Service_Platform_Title")); - this.setSmallIcon("/com/fr/design/images/platform/platform", false); + this.setSmallIcon(new LazyIcon("servicePlatform")); } @Override diff --git a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java index ba37ea18b7..374da1c83d 100644 --- a/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java +++ b/designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java @@ -1,5 +1,6 @@ package com.fr.design.report.fit.menupane; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.JTemplateAction; import com.fr.design.beans.BasicBeanPane; import com.fr.design.dialog.DialogActionAdapter; @@ -45,7 +46,7 @@ public class ReportFitAttrAction extends JTemplateAction { this.setMenuKeySet(REPORT_FIT_ATTR); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/reportfit/fit"); + this.setSmallIcon(new LazyIcon("reportFit")); } /** diff --git a/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java b/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java index 2b768d995b..de9e0564d5 100644 --- a/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java +++ b/designer-base/src/main/java/com/fr/design/update/actions/SoftwareUpdateAction.java @@ -1,6 +1,6 @@ package com.fr.design.update.actions; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.os.impl.UpdateDialogAction; import com.fr.stable.os.support.OSBasedAction; @@ -15,7 +15,7 @@ public class SoftwareUpdateAction extends UpdateAction { public SoftwareUpdateAction() { setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Updater_UpdateAndUpgrade")); - setSmallIcon("/com/fr/design/images/update/update_new"); + setSmallIcon(new LazyIcon("update")); } diff --git a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java index 42ab6306ac..9052e99ae8 100644 --- a/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java +++ b/designer-base/src/main/java/com/fr/env/detect/ui/EnvDetectorAction.java @@ -1,5 +1,6 @@ package com.fr.env.detect.ui; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; @@ -16,7 +17,7 @@ public class EnvDetectorAction extends UpdateAction { public EnvDetectorAction() { this.setName(Toolkit.i18nText("Fine-Design_Basic_Carton_Toolbox_Title")); - this.setSmallIcon("com/fr/env/detect/detect_normal.svg"); + this.setSmallIcon(new LazyIcon("envDetect")); } @Override diff --git a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java index 21c7f3ac93..1debda8e50 100644 --- a/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java +++ b/designer-base/src/main/java/com/fr/widgettheme/designer/WidgetThemeDisplayAction.java @@ -1,15 +1,15 @@ package com.fr.widgettheme.designer; +import com.fine.theme.icon.LazyIcon; import com.fr.base.io.BaseBook; -import com.fr.base.svg.IconUtils; import com.fr.design.actions.JTemplateAction; -import com.fr.widgettheme.util.WidgetThemeDesignerUtils; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.file.HistoryTemplateListCache; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JTemplate; import com.fr.widgettheme.control.attr.WidgetDisplayEnhanceMarkAttr; +import com.fr.widgettheme.util.WidgetThemeDesignerUtils; import java.awt.event.ActionEvent; @@ -25,7 +25,7 @@ public class WidgetThemeDisplayAction> extends JTempla public WidgetThemeDisplayAction(T jwb) { super(jwb); setName(Toolkit.i18nText("Fine-Design_Widget_Display_Enhance")); - this.setSmallIcon(IconUtils.readIcon("/com/fr/widgettheme/menu.svg")); + this.setSmallIcon(new LazyIcon("widgetThemeMenu")); } @Override diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter.svg new file mode 100644 index 0000000000..9c01e5ff5e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter_disable.svg new file mode 100644 index 0000000000..d5fa0e46d9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/actCenter_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit.svg new file mode 100644 index 0000000000..f44b579ef3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit_disable.svg new file mode 100644 index 0000000000..8dcd677a45 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/allowAuthorityEdit_disable.svg @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs.svg new file mode 100644 index 0000000000..6c01e3bc3f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs_disable.svg new file mode 100644 index 0000000000..d77d19464d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bbs_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug.svg new file mode 100644 index 0000000000..9ea08d02b7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug_disable.svg new file mode 100644 index 0000000000..480a46eb13 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/bug_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData.svg new file mode 100644 index 0000000000..48a36d6be2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData_disable.svg new file mode 100644 index 0000000000..5483d0537e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/charMapData_disable.svg @@ -0,0 +1,11 @@ + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg new file mode 100644 index 0000000000..578ad9d1ce --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle_disable.svg new file mode 100644 index 0000000000..03fc5da621 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartEmptyDataStyle_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle.svg new file mode 100644 index 0000000000..c84bcb704b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle_disable.svg new file mode 100644 index 0000000000..3018bf1999 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/chartPreStyle_disable.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt.svg new file mode 100755 index 0000000000..819a90d662 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt_disable.svg new file mode 100755 index 0000000000..3fbc7e166d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createCpt_disable.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther.svg new file mode 100755 index 0000000000..4b84498db3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther_disable.svg new file mode 100755 index 0000000000..a31ec72292 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/createOther_disable.svg @@ -0,0 +1,13 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource.svg new file mode 100644 index 0000000000..85f677a337 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource_disable.svg new file mode 100644 index 0000000000..9da578a790 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/datasource_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo.svg new file mode 100644 index 0000000000..40cbc7f35a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo_disable.svg new file mode 100644 index 0000000000..70a51ebc32 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/demo_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect.svg new file mode 100644 index 0000000000..ca309348c8 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect_disable.svg new file mode 100644 index 0000000000..47ec58aba5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/envDetect_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export.svg new file mode 100644 index 0000000000..6c14b39d27 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export_disable.svg new file mode 100644 index 0000000000..7a15aff7c9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/export_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager.svg new file mode 100644 index 0000000000..95debb410a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager_disable.svg new file mode 100644 index 0000000000..c9a7a037f7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/functionManager_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help.svg new file mode 100644 index 0000000000..53344f0633 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help_disable.svg new file mode 100644 index 0000000000..6093ac8b77 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/help_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr.svg new file mode 100644 index 0000000000..a2b6d3611c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr_disable.svg new file mode 100644 index 0000000000..d5d2f90cbb --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/linearAttr_disable.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr.svg new file mode 100644 index 0000000000..fde8b271b7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr_disable.svg new file mode 100644 index 0000000000..f3a4148cc7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/mobileAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase.svg new file mode 100644 index 0000000000..d4faa9d930 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase_disable.svg new file mode 100644 index 0000000000..9ac86f3182 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochromeServerDatabase_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo.svg new file mode 100644 index 0000000000..248d6dcde5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo_disable.svg new file mode 100644 index 0000000000..86bc5fa285 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_redo_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo.svg new file mode 100644 index 0000000000..56757baec7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo_disable.svg new file mode 100644 index 0000000000..fb28a62cbf --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/monochrome_undo_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need.svg new file mode 100644 index 0000000000..e6af95c670 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need_disable.svg new file mode 100644 index 0000000000..4130bdb0d7 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/need_disable.svg @@ -0,0 +1,11 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate.svg new file mode 100644 index 0000000000..5f4af68e47 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate_disable.svg new file mode 100644 index 0000000000..5a304c7bcd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/openTemplate_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup.svg new file mode 100644 index 0000000000..72fa857c3b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup_disable.svg new file mode 100644 index 0000000000..1f23b45f32 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pageSetup_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform.svg new file mode 100644 index 0000000000..743829f741 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform_disable.svg new file mode 100644 index 0000000000..873fb9f4d1 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/platform_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager.svg new file mode 100644 index 0000000000..3d637f7a96 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager_disable.svg new file mode 100644 index 0000000000..afcb393ba9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/pluginManager_disable.svg @@ -0,0 +1,8 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print.svg new file mode 100755 index 0000000000..802cd701d6 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print_disable.svg new file mode 100755 index 0000000000..f4023c9788 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/print_disable.svg @@ -0,0 +1,4 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question.svg new file mode 100644 index 0000000000..8fe8f7fa18 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question_disable.svg new file mode 100644 index 0000000000..3bb377af34 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/question_disable.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen.svg new file mode 100644 index 0000000000..057f0d46df --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen_disable.svg new file mode 100644 index 0000000000..23db4a9bce --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/repeatAndFrozen_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace.svg new file mode 100644 index 0000000000..4ce772e3da --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace_disable.svg new file mode 100644 index 0000000000..2b1513242c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/replace_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground.svg new file mode 100644 index 0000000000..a37d52aefd --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground_disable.svg new file mode 100644 index 0000000000..76bfd4103b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportBackground_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr.svg new file mode 100644 index 0000000000..c663fe3ce0 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr_disable.svg new file mode 100644 index 0000000000..c6b016fa49 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportEngineAttr_disable.svg @@ -0,0 +1,14 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit.svg new file mode 100644 index 0000000000..dfb5b3c9c9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit_disable.svg new file mode 100644 index 0000000000..5e0b16c39f --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFit_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter.svg new file mode 100755 index 0000000000..0cf7ba674d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter_disable.svg new file mode 100755 index 0000000000..c47e8346d2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportFooter_disable.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader.svg new file mode 100755 index 0000000000..483fa79587 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader_disable.svg new file mode 100755 index 0000000000..704fe328fa --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportHeader_disable.svg @@ -0,0 +1,9 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter.svg new file mode 100644 index 0000000000..423882917c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter_disable.svg new file mode 100644 index 0000000000..c4fed0bf28 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportParameter_disable.svg @@ -0,0 +1,11 @@ + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr.svg new file mode 100644 index 0000000000..2e39e4e9ee --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr_disable.svg new file mode 100644 index 0000000000..ab1ecde62a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/reportWriteAttr_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg new file mode 100644 index 0000000000..059e2e6b42 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg new file mode 100644 index 0000000000..fcfb30eaa4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/saveAs_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager.svg new file mode 100644 index 0000000000..36123b2b85 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager_disable.svg new file mode 100644 index 0000000000..5d1803122c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/serverConfigManager_disable.svg @@ -0,0 +1,12 @@ + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign.svg new file mode 100644 index 0000000000..434ec48152 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign.svg @@ -0,0 +1,14 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign_disable.svg new file mode 100644 index 0000000000..1ea6b13052 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/sign_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution.svg new file mode 100644 index 0000000000..09b8b3f297 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution_disable.svg new file mode 100644 index 0000000000..60491f447d --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/solution_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan.svg new file mode 100644 index 0000000000..19b01795a4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan_disable.svg new file mode 100644 index 0000000000..1a1640ad33 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/studyPlan_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv.svg new file mode 100644 index 0000000000..1aabb99ff3 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv_disable.svg new file mode 100644 index 0000000000..5edb4eacd5 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/switchEnv_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore.svg new file mode 100644 index 0000000000..bfedf499d9 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore_disable.svg new file mode 100644 index 0000000000..d37287b27a --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/templateStore_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update.svg new file mode 100644 index 0000000000..6430a6bcf2 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update_disable.svg new file mode 100644 index 0000000000..c69a417f9b --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/update_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video.svg new file mode 100644 index 0000000000..6b83ecc90c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video_disable.svg new file mode 100644 index 0000000000..f0bd8cd911 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/video_disable.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark.svg new file mode 100644 index 0000000000..9b314c514c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark_disable.svg new file mode 100644 index 0000000000..725c4b10ea --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/watermark_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute.svg new file mode 100644 index 0000000000..f132dd570c --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute_disable.svg new file mode 100644 index 0000000000..318c15f130 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/webReportAttribute_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager.svg new file mode 100644 index 0000000000..c919716b53 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager_disable.svg new file mode 100644 index 0000000000..271256d571 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetManager_disable.svg @@ -0,0 +1,7 @@ + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu.svg new file mode 100644 index 0000000000..359597af47 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu_disable.svg new file mode 100644 index 0000000000..0f87deeaf4 --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/widgetThemeMenu_disable.svg @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter.svg new file mode 100644 index 0000000000..4fc373159e --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter_disable.svg b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter_disable.svg new file mode 100644 index 0000000000..471d7c5cad --- /dev/null +++ b/designer-base/src/main/resources/com/fine/theme/icon/toolbar/workOrderCenter_disable.svg @@ -0,0 +1,5 @@ + + + diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java index 2ed319249a..240aff93db 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStyleAction.java @@ -1,12 +1,12 @@ package com.fr.design.module; +import com.fine.theme.icon.LazyIcon; import com.fr.base.ChartEmptyDataStyleConf; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerFrame; -import com.fr.general.IOUtils; import com.fr.transaction.CallBackAdaptor; import com.fr.transaction.Configurations; import com.fr.transaction.WorkerFacade; @@ -20,7 +20,7 @@ import java.awt.event.ActionEvent; public class ChartEmptyDataStyleAction extends UpdateAction { public ChartEmptyDataStyleAction() { - this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/EmptyChart.png")); + this.setSmallIcon(new LazyIcon("chartEmptyDataStyle")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Empty_Data")); } diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java index e989e1a364..50f07d2bb8 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java @@ -1,7 +1,7 @@ package com.fr.design.module; +import com.fine.theme.icon.LazyIcon; import com.fr.base.ChartPreStyleConfig; -import com.fr.base.svg.IconUtils; import com.fr.concurrent.NamedThreadFactory; import com.fr.design.actions.UpdateAction; import com.fr.design.dialog.BasicDialog; @@ -16,10 +16,10 @@ import com.fr.transaction.WorkerFacade; import com.fr.van.chart.designer.component.VanChartFillStylePane; import javax.swing.KeyStroke; +import java.awt.event.ActionEvent; import java.awt.event.WindowAdapter; import java.awt.event.WindowEvent; import java.util.concurrent.ExecutorService; -import java.awt.event.ActionEvent; /** * 图表预定义样式Action. @@ -35,7 +35,7 @@ public class ChartPreStyleAction extends UpdateAction { this.setMenuKeySet(CHART_DEFAULT_STYLE); this.setName(getMenuKeySet().getMenuKeySetName()+ "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("com/fr/design/images/chart/ChartType"); + this.setSmallIcon(new LazyIcon("chartPreStyle")); this.generateAndSetSearchText(ChartPreStyleManagerPane.class.getName()); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java b/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java index e9b0373a83..4143b562b3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/server/ChartMapEditorAction.java @@ -1,11 +1,10 @@ package com.fr.van.chart.map.server; +import com.fine.theme.icon.LazyIcon; import com.fr.base.ServerConfig; -import com.fr.base.svg.IconUtils; import com.fr.design.DesignerEnvManager; import com.fr.design.actions.UpdateAction; import com.fr.general.GeneralContext; - import com.fr.start.ServerStarter; import com.fr.workspace.WorkContext; @@ -17,7 +16,7 @@ import java.awt.event.ActionEvent; public class ChartMapEditorAction extends UpdateAction { public ChartMapEditorAction(){ - this.setSmallIcon("/com/fr/van/chart/map/images/mapData"); + this.setSmallIcon(new LazyIcon("charMapData")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Map_Data")); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/PDFExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/PDFExportAction.java index e6fc6b5406..da969fc68a 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/PDFExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/PDFExportAction.java @@ -3,7 +3,7 @@ */ package com.fr.design.actions.file.export; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.extension.FileExtension; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.JWorkBook; @@ -23,7 +23,7 @@ public class PDFExportAction extends AbstractWorkBookExportAction { this.setMenuKeySet(KeySetUtils.PDF_EXPORT); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/pdf.png")); + this.setSmallIcon(new LazyIcon("pdfFile")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java index 9e1a919848..99090a4ffb 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/export/WordExportAction.java @@ -3,7 +3,7 @@ */ package com.fr.design.actions.file.export; -import com.fr.base.BaseUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.base.extension.FileExtension; import com.fr.design.i18n.Toolkit; import com.fr.design.mainframe.JWorkBook; @@ -23,7 +23,7 @@ public class WordExportAction extends AbstractWorkBookExportAction { this.setMenuKeySet(KeySetUtils.WORD_EXPORT); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/word.png")); + this.setSmallIcon(new LazyIcon("wordFile")); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java index 371e952baf..5f41bd5f89 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java @@ -1,13 +1,12 @@ package com.fr.design.actions.file.newReport; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.JWorkBook; import com.fr.design.menu.MenuKeySet; - import javax.swing.Icon; import javax.swing.KeyStroke; import java.awt.event.ActionEvent; @@ -26,7 +25,7 @@ public class NewWorkBookAction extends UpdateAction { } protected Icon icon() { - return IconUtils.readIcon("/com/fr/design/images/buttonicon/newcpts"); + return new LazyIcon("createCpt"); } /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java index db4a6b8be0..015db6f1c5 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java @@ -3,10 +3,10 @@ */ package com.fr.design.actions.insert.flot; +import com.fine.theme.icon.LazyIcon; import com.fr.base.DynamicUnitList; import com.fr.base.Style; import com.fr.base.chart.BaseChartCollection; - import com.fr.design.actions.ElementCaseAction; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.file.HistoryTemplateListPane; @@ -49,7 +49,7 @@ public class ChartFloatAction extends ElementCaseAction { this.setMenuKeySet(FLOAT_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 FLOAT_INSERT_CHART = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java index 616bf7c9d6..cdecd8b2de 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java @@ -3,6 +3,7 @@ */ package com.fr.design.actions.insert.flot; +import com.fine.theme.icon.LazyIcon; import com.fr.base.BaseFormula; import com.fr.base.DynamicUnitList; import com.fr.design.actions.ElementCaseAction; @@ -37,7 +38,7 @@ public class FormulaFloatAction extends ElementCaseAction { this.setMenuKeySet(FLOAT_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 FLOAT_INSERT_FORMULA = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java index ca33b15e85..526f1b77c8 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java @@ -3,8 +3,8 @@ */ package com.fr.design.actions.insert.flot; +import com.fine.theme.icon.LazyIcon; import com.fr.base.DynamicUnitList; - import com.fr.design.actions.ElementCaseAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -15,7 +15,6 @@ import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.theme.utils.DefaultThemedFloatElement; import com.fr.design.menu.MenuKeySet; import com.fr.design.report.SelectImagePane; - import com.fr.grid.Grid; import com.fr.grid.selection.FloatSelection; import com.fr.report.ReportHelper; @@ -40,7 +39,7 @@ public class ImageFloatAction extends ElementCaseAction { this.setMenuKeySet(FLOAT_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 FLOAT_INSERT_IMAGE = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java index 59c2a3b0bd..9ca346d386 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java @@ -3,6 +3,7 @@ */ package com.fr.design.actions.insert.flot; +import com.fine.theme.icon.LazyIcon; import com.fr.base.DynamicUnitList; import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.mainframe.ElementCasePane; @@ -28,7 +29,7 @@ public class TextBoxFloatAction extends AbstractShapeAction { this.setMenuKeySet(FLOAT_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 FLOAT_INSERT_TEXT = new MenuKeySet() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/replace/ITReplaceAction.java b/designer-realize/src/main/java/com/fr/design/actions/replace/ITReplaceAction.java index 6d085cbbdf..a4b30753c6 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/replace/ITReplaceAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/replace/ITReplaceAction.java @@ -1,17 +1,13 @@ package com.fr.design.actions.replace; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.UpdateAction; -import com.fr.design.dialog.UIDialog; -import com.fr.design.file.HistoryTemplateListCache; +import com.fr.design.actions.replace.ui.ITReplaceMainDialog; import com.fr.design.i18n.Toolkit; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.MenuKeySet; -import com.fr.design.actions.replace.ui.ITReplaceMainDialog; -import com.fr.design.utils.gui.GUICoreUtils; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; -import java.awt.event.InputEvent; import java.awt.event.KeyEvent; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -29,7 +25,7 @@ public class ITReplaceAction extends UpdateAction { this.setName(getMenuKeySet().getMenuName()); this.setMnemonic(getMenuKeySet().getMnemonic()); this.setAccelerator(getMenuKeySet().getKeyStroke()); - this.setSmallIcon("/com/fr/design/images/replace/replace"); + this.setSmallIcon(new LazyIcon("replace")); } private static final MenuKeySet IT_REPLACE = new MenuKeySet() { 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 481d2e0941..2d6e6f0690 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 @@ -4,6 +4,7 @@ package com.fr.design.actions.report; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.ReportComponentAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -12,7 +13,6 @@ import com.fr.design.mainframe.ReportComponent; import com.fr.design.menu.KeySetUtils; import com.fr.design.report.NewReportBackgroundPane; import com.fr.report.core.ReportUtils; -import com.fr.report.report.Report; /** * Background action. @@ -24,7 +24,7 @@ public class ReportBackgroundAction extends ReportComponentAction { @@ -17,7 +17,7 @@ public class ReportColumnsAction extends ReportComponentAction { this.setMenuKeySet(KeySetUtils.REPORT_FOOTER); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_report/footer"); + this.setSmallIcon(new LazyIcon("reportFooter")); } /** 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 c23ed10b53..2076aa510b 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 @@ -4,7 +4,7 @@ package com.fr.design.actions.report; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.ReportComponentAction; import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.headerfooter.EditHeaderPane; @@ -33,7 +33,7 @@ public class ReportHeaderAction extends ReportComponentAction { this.setMenuKeySet(KeySetUtils.REPORT_HEADER); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_report/header"); + this.setSmallIcon(new LazyIcon("reportHeader")); } /** diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java index b18c62b086..c620e11264 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportMobileAttrAction.java @@ -1,8 +1,8 @@ package com.fr.design.actions.report; +import com.fine.theme.icon.LazyIcon; import com.fr.base.PaperSize; import com.fr.base.iofile.attr.MobileOnlyTemplateAttrMark; -import com.fr.base.svg.IconUtils; import com.fr.design.actions.JWorkBookAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -11,7 +11,6 @@ import com.fr.design.mainframe.JWorkBook; import com.fr.design.menu.MenuKeySet; import com.fr.design.report.mobile.ReportMobileAttrPane; import com.fr.file.FILE; - import com.fr.intelli.record.Focus; import com.fr.main.TemplateWorkBook; import com.fr.page.PaperSettingProvider; @@ -19,7 +18,7 @@ import com.fr.record.analyzer.EnableMetrics; import com.fr.report.mobile.ElementCaseMobileAttr; import com.fr.report.report.Report; -import javax.swing.*; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; /** @@ -35,7 +34,7 @@ public class ReportMobileAttrAction extends JWorkBookAction{ this.setMenuKeySet(REPORT_APP_ATTR); this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon("/com/fr/design/images/m_report/mobile"); + this.setSmallIcon(new LazyIcon("mobileAttr")); this.generateAndSetSearchText(ReportMobileAttrPane.class.getName()); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java b/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java index 9177f4d307..33878960d8 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/report/ReportPageAttrAction.java @@ -3,7 +3,7 @@ */ package com.fr.design.actions.report; -import com.fr.base.svg.IconUtils; +import com.fine.theme.icon.LazyIcon; import com.fr.design.actions.ReportComponentAction; import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.DialogActionAdapter; @@ -27,7 +27,7 @@ public class ReportPageAttrAction extends ReportComponentAction { private MenuDef createWorkBookExportMenu() { MenuDef excelExportMenuDef = new MenuDef(KeySetUtils.EXCEL_EXPORT.getMenuKeySetName(), KeySetUtils.EXCEL_EXPORT.getMnemonic()); - excelExportMenuDef.setIconPath("/com/fr/design/images/m_file/excel.png"); + excelExportMenuDef.setIcon(new LazyIcon("excel_icon")); excelExportMenuDef .addShortCut(new PageExcelExportAction(this), new ExcelExportAction(this), new PageToSheetExcelExportAction(this)); // Export - MenuDef MenuDef exportMenuDef = new MenuDef(KeySetUtils.EXPORT.getMenuName()); - exportMenuDef.setIconPath("/com/fr/design/images/m_file/export"); + exportMenuDef.setIcon(new LazyIcon("export")); addShortCut(exportMenuDef, excelExportMenuDef); return exportMenuDef; } diff --git a/designer-realize/src/main/java/com/fr/start/MainDesigner.java b/designer-realize/src/main/java/com/fr/start/MainDesigner.java index a49e5ba721..315c624efa 100644 --- a/designer-realize/src/main/java/com/fr/start/MainDesigner.java +++ b/designer-realize/src/main/java/com/fr/start/MainDesigner.java @@ -217,7 +217,7 @@ public class MainDesigner extends BaseDesigner { shortCuts.add(new NewWorkBookAction()); // 决策报表、聚合报表归入其他 MenuDef newOtherFileMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Other_Template")); - newOtherFileMenuDef.setIconPath("/com/fr/design/images/buttonicon/new_other"); + newOtherFileMenuDef.setIcon(new LazyIcon("createOther")); try { // todo:菜单 if (DesignModuleFactory.getNewFormAction() != null) { From b818ebb5d966e764dda8294930aef233916724fe Mon Sep 17 00:00:00 2001 From: "Leo.Qin" Date: Wed, 10 Jan 2024 20:23:53 +0800 Subject: [PATCH 2/2] =?UTF-8?q?REPORT-107973=20=E5=B7=A5=E5=85=B7=E6=A0=8F?= =?UTF-8?q?=E5=8F=8D=E7=99=BD=E5=9B=BE=E6=A0=87=E7=BB=98=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/fine/theme/light/ui/FineMenuUI.java | 40 ------------------- .../mainframe/EastRegionContainerPane.java | 2 + .../main/java/com/fr/design/menu/MenuDef.java | 8 ++++ .../theme/light/ui/laf/FineLaf.properties | 2 +- .../light/ui/laf/FineLightLaf.properties | 3 +- .../components/PopupMenuStoryBoard.java | 33 ++++++++++++--- 6 files changed, 40 insertions(+), 48 deletions(-) delete mode 100644 designer-base/src/main/java/com/fine/theme/light/ui/FineMenuUI.java diff --git a/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuUI.java b/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuUI.java deleted file mode 100644 index b71b816a07..0000000000 --- a/designer-base/src/main/java/com/fine/theme/light/ui/FineMenuUI.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.fine.theme.light.ui; - -import com.fine.theme.icon.LazyIcon; -import com.formdev.flatlaf.ui.FlatMenuUI; - -import javax.swing.JComponent; -import javax.swing.plaf.ComponentUI; -import java.awt.Graphics; - -/** - * 弹窗菜单UI - * - * @author Leo.Qin - * @since 11.0 - * Created on 2024/1/8 - */ -public class FineMenuUI extends FlatMenuUI { - - - /** - * 创建UI - * - * @param c - * @return - */ - public static ComponentUI createUI(JComponent c) { - return new FineMenuUI(); - } - - @Override - protected void installDefaults() { - arrowIcon = new LazyIcon("triangle_right"); - super.installDefaults(); - } - - @Override - public void paint(Graphics g, JComponent c) { - super.paint(g, c); - } -} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java index 1b782dd300..f060bf0fff 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/EastRegionContainerPane.java @@ -1,6 +1,7 @@ package com.fr.design.mainframe; import com.fine.theme.icon.LazyIcon; +import com.fine.theme.light.ui.RectangleButtonUI; import com.fine.theme.utils.FineUIScale; import com.fine.theme.utils.FineUIUtils; import com.formdev.flatlaf.FlatDarkLaf; @@ -1004,6 +1005,7 @@ public class EastRegionContainerPane extends UIEastResizableContainer { }; button.setDisabledIcon(new LazyIcon(btnIconName + ICON_SUFFIX_DISABLED)); button.set4LargeToolbarButton(); + button.setUI(new RectangleButtonUI(false)); setStyle(button, STYLE_TEXT); button.addActionListener(new ActionListener() { @Override diff --git a/designer-base/src/main/java/com/fr/design/menu/MenuDef.java b/designer-base/src/main/java/com/fr/design/menu/MenuDef.java index 1f5de9a2d1..1de6b78b38 100644 --- a/designer-base/src/main/java/com/fr/design/menu/MenuDef.java +++ b/designer-base/src/main/java/com/fr/design/menu/MenuDef.java @@ -361,11 +361,19 @@ public class MenuDef extends ShortCut { for (MenuElement subElement : subElements) { if (subElement instanceof JMenu) { JMenu jMenu = (JMenu) subElement; + Icon icon = jMenu.getIcon(); + if (icon instanceof LazyIcon && jMenu.getSelectedIcon() == null) { + jMenu.setSelectedIcon(((LazyIcon) icon).white()); + } setStyle(jMenu, FineUIStyle.MENU_TOOL_BAR); JPopupMenu childPopupMenu = jMenu.getPopupMenu(); setToolBarClientProperty(childPopupMenu); } else if (subElement instanceof JMenuItem) { JMenuItem jMenuItem = (JMenuItem) subElement; + Icon icon = jMenuItem.getIcon(); + if (icon instanceof LazyIcon && jMenuItem.getSelectedIcon() == null) { + jMenuItem.setSelectedIcon(((LazyIcon) icon).white()); + } setStyle(jMenuItem, FineUIStyle.MENU_ITEM_TOOL_BAR); } } diff --git a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties index 8985e99dd0..7f26ba5f10 100644 --- a/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties +++ b/designer-base/src/main/resources/com/fine/theme/light/ui/laf/FineLaf.properties @@ -13,7 +13,7 @@ FormattedTextFieldUI=com.formdev.flatlaf.ui.FlatFormattedTextFieldUI InternalFrameUI=com.formdev.flatlaf.ui.FlatInternalFrameUI LabelUI=com.formdev.flatlaf.ui.FlatLabelUI ListUI=com.formdev.flatlaf.ui.FlatListUI -MenuUI=com.fine.theme.light.ui.FineMenuUI +MenuUI=com.formdev.flatlaf.ui.FlatMenuUI MenuBarUI=com.formdev.flatlaf.ui.FlatMenuBarUI MenuItemUI=com.fine.theme.light.ui.FineMenuItemUI OptionPaneUI=com.formdev.flatlaf.ui.FlatOptionPaneUI 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 d9deea101b..d3a8bc0066 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 @@ -1274,7 +1274,8 @@ CellOtherSetPane.height=$Component.defaultHeight selectionBackground : $brand.normal; \ selectionForeground : $text.white; \ acceleratorForeground : @foreground; \ - acceleratorSelectionForeground : $text.white + acceleratorSelectionForeground : $text.white; \ + icon.arrowType : triangle; [style]MenuItem.menuItemToolBar=\ selectionBackground : $brand.normal; \ selectionForeground : $text.white; \ diff --git a/designer-base/src/test/java/com/fr/design/gui/storybook/components/PopupMenuStoryBoard.java b/designer-base/src/test/java/com/fr/design/gui/storybook/components/PopupMenuStoryBoard.java index fb4354d3df..bd202b6f50 100644 --- a/designer-base/src/test/java/com/fr/design/gui/storybook/components/PopupMenuStoryBoard.java +++ b/designer-base/src/test/java/com/fr/design/gui/storybook/components/PopupMenuStoryBoard.java @@ -10,16 +10,20 @@ import com.fr.design.gui.storybook.StoryBoard; import com.fr.design.menu.DottedSeparator; import com.fr.design.menu.NameSeparator; +import javax.swing.Icon; import javax.swing.JMenu; import javax.swing.JMenuItem; import javax.swing.JPopupMenu; +import javax.swing.KeyStroke; import javax.swing.MenuElement; +import java.awt.event.KeyEvent; import java.awt.event.MouseAdapter; import java.awt.event.MouseEvent; import static com.fine.swing.ui.layout.Layouts.cell; import static com.fine.swing.ui.layout.Layouts.column; import static com.fine.theme.utils.FineUIStyle.setStyle; +import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; /** * 弹窗组件 @@ -36,14 +40,19 @@ public class PopupMenuStoryBoard extends StoryBoard { column(70, cell(new UIButton("点击展示弹窗")).with(it -> { UIPopupMenu popupMenu = new UIPopupMenu(); - popupMenu.add(new UIMenuItem("test1", new LazyIcon("edit"))); + popupMenu.add(new UIMenuItem("test1")); popupMenu.add(new UIMenuItem("test2", new LazyIcon("cellHyperLinkAttr"))); popupMenu.addSeparator(); popupMenu.add(new UIMenuItem("test3", new LazyIcon("cellClear"))); popupMenu.add(new NameSeparator("分割线").createMenuItem()); - popupMenu.add(new UIMenuItem("test4", new LazyIcon("cellOtherAttr"))); + UIMenuItem menuItem = new UIMenuItem("test4", new LazyIcon("cellOtherAttr")); + menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, DEFAULT_MODIFIER)); + popupMenu.add(menuItem); popupMenu.add(new DottedSeparator().createMenuItem()); - popupMenu.add(new UIMenuItem("test5", new LazyIcon("cellExpandAttr"))); + JMenu test5 = new JMenu("test5"); + test5.setIcon(new LazyIcon("cellExpandAttr")); + popupMenu.add(test5); + it.addMouseListener(new MouseAdapter() { @@ -57,14 +66,18 @@ public class PopupMenuStoryBoard extends StoryBoard { cell(new UIButton("点击展示菜单栏弹窗")).with(it -> { UIPopupMenu popupMenu = new UIPopupMenu(); - popupMenu.add(new UIMenuItem("test1", new LazyIcon("edit"))); + popupMenu.add(new UIMenuItem("test1")); popupMenu.add(new UIMenuItem("test2", new LazyIcon("cellHyperLinkAttr"))); popupMenu.addSeparator(); popupMenu.add(new UIMenuItem("test3", new LazyIcon("cellClear"))); popupMenu.add(new NameSeparator("分割线").createMenuItem()); - popupMenu.add(new UIMenuItem("test4", new LazyIcon("cellOtherAttr"))); + UIMenuItem menuItem = new UIMenuItem("test4", new LazyIcon("cellOtherAttr")); + menuItem.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_N, DEFAULT_MODIFIER)); + popupMenu.add(menuItem); popupMenu.add(new DottedSeparator().createMenuItem()); - popupMenu.add(new UIMenuItem("test5", new LazyIcon("cellExpandAttr"))); + JMenu test5 = new JMenu("test5"); + test5.setIcon(new LazyIcon("cellExpandAttr")); + popupMenu.add(test5); it.addMouseListener(new MouseAdapter() { @@ -90,11 +103,19 @@ public class PopupMenuStoryBoard extends StoryBoard { for (MenuElement subElement : subElements) { if (subElement instanceof JMenu) { JMenu jMenu = (JMenu) subElement; + Icon icon = jMenu.getIcon(); + if (icon instanceof LazyIcon && jMenu.getSelectedIcon() == null) { + jMenu.setSelectedIcon(((LazyIcon) icon).white()); + } JPopupMenu childPopupMenu = jMenu.getPopupMenu(); setStyle(jMenu, FineUIStyle.MENU_TOOL_BAR); setToolBarClientProperty(childPopupMenu); } else if (subElement instanceof JMenuItem) { JMenuItem jMenuItem = (JMenuItem) subElement; + Icon icon = jMenuItem.getIcon(); + if (icon instanceof LazyIcon && jMenuItem.getSelectedIcon() == null) { + jMenuItem.setSelectedIcon(((LazyIcon) icon).white()); + } setStyle(jMenuItem, FineUIStyle.MENU_ITEM_TOOL_BAR); } }