diff --git a/designer-base/src/com/fr/design/menu/KeySetUtils.java b/designer-base/src/com/fr/design/menu/KeySetUtils.java index 949d5334c4..e95b51e958 100644 --- a/designer-base/src/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/com/fr/design/menu/KeySetUtils.java @@ -592,7 +592,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return Inter.getLocText("M_Report-Report_Background"); + return Inter.getLocText("Fine-Designer_Report_Background"); } @Override diff --git a/designer-form/src/com/fr/design/mainframe/JForm.java b/designer-form/src/com/fr/design/mainframe/JForm.java index 5b06619515..4f98378061 100644 --- a/designer-form/src/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/com/fr/design/mainframe/JForm.java @@ -815,14 +815,6 @@ public class JForm extends JTemplate implements BaseJForm { } } - /** - * 模板更新 - */ - public void fireTargetModified() { - super.fireTargetModified(); - WidgetPropertyPane.getInstance().refreshDockingView(); - } - /** * 在Form和ElementCase, 以及ElementCase和ElementCase之间切换 * diff --git a/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java b/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java index 51bba7487c..74b36372b5 100644 --- a/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java +++ b/designer-realize/src/com/fr/design/mainframe/errorinfo/ErrorInfoLogAppender.java @@ -120,7 +120,6 @@ public class ErrorInfoLogAppender extends AppenderSkeleton { @Override public void readXML(XMLableReader reader) { - super.readXML(reader); readDesign(reader); } diff --git a/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java b/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java index a3e913fe41..7c8c3de822 100644 --- a/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java +++ b/designer-realize/src/com/fr/design/report/ReportBackgroundPane.java @@ -1,16 +1,18 @@ package com.fr.design.report; -import java.awt.BorderLayout; - -import com.fr.page.ReportSettingsProvider; +import com.fr.design.dialog.BasicPane; import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; -import com.fr.general.Inter; import com.fr.design.style.background.BackgroundPane; +import com.fr.general.Inter; +import com.fr.page.ReportSettingsProvider; + +import javax.swing.JPanel; +import java.awt.BorderLayout; public class ReportBackgroundPane extends BasicPane { private UICheckBox isPrintBackgroundCheckBox; + private UICheckBox isExportBackgroundCheckBox; private BackgroundPane backgroundPane; public ReportBackgroundPane() { @@ -19,14 +21,17 @@ public class ReportBackgroundPane extends BasicPane { backgroundPane = new BackgroundPane(); this.add(backgroundPane, BorderLayout.CENTER); - isPrintBackgroundCheckBox = new UICheckBox( - Inter.getLocText("ReportGUI-Print_Background")); - this.add(isPrintBackgroundCheckBox, BorderLayout.SOUTH); + isPrintBackgroundCheckBox = new UICheckBox(Inter.getLocText("Fine-Designer_Print_Background")); + isExportBackgroundCheckBox = new UICheckBox(Inter.getLocText("Fine-Designer_Export_Background")); + JPanel sourth = new JPanel(); + sourth.add(isExportBackgroundCheckBox); + sourth.add(isPrintBackgroundCheckBox); + this.add(sourth, BorderLayout.SOUTH); } @Override protected String title4PopupWindow() { - return Inter.getLocText(new String[]{"paper", "Background"}); + return Inter.getLocText("Fine-Designer_Report_Background"); } /** @@ -35,6 +40,7 @@ public class ReportBackgroundPane extends BasicPane { public void populate(ReportSettingsProvider reportSettings) { this.backgroundPane.populate(reportSettings.getBackground()); this.isPrintBackgroundCheckBox.setSelected(reportSettings.isPrintBackground()); + this.isExportBackgroundCheckBox.setSelected(reportSettings.isExportBackground()); } /** @@ -43,5 +49,6 @@ public class ReportBackgroundPane extends BasicPane { public void update(ReportSettingsProvider reportSettings) { reportSettings.setBackground(this.backgroundPane.update()); reportSettings.setPrintBackground(this.isPrintBackgroundCheckBox.isSelected()); + reportSettings.setExportBackground(this.isExportBackgroundCheckBox.isSelected()); } } \ No newline at end of file diff --git a/designer-realize/src/com/fr/start/Designer.java b/designer-realize/src/com/fr/start/Designer.java index fad29deb3f..178739fe39 100644 --- a/designer-realize/src/com/fr/start/Designer.java +++ b/designer-realize/src/com/fr/start/Designer.java @@ -44,6 +44,7 @@ import com.fr.general.ComparatorUtils; import com.fr.general.Inter; import com.fr.module.Module; import com.fr.module.ModuleContext; +import com.fr.record.analyzer.FineAnalyzer; import com.fr.stable.BuildContext; import com.fr.stable.OperatingSystem; import com.fr.stable.ProductConstants; @@ -97,6 +98,8 @@ public class Designer extends BaseDesigner { */ public static void main(String[] args) { + FineAnalyzer.init(); + BuildContext.setBuildFilePath("/com/fr/stable/build.properties"); diff --git a/designer-realize/src/com/fr/start/module/DesignerStartup.java b/designer-realize/src/com/fr/start/module/DesignerStartup.java index 1936451f26..bd43d4c831 100644 --- a/designer-realize/src/com/fr/start/module/DesignerStartup.java +++ b/designer-realize/src/com/fr/start/module/DesignerStartup.java @@ -4,6 +4,8 @@ import com.fr.design.mainframe.DesignerContext; import com.fr.event.Event; import com.fr.event.Listener; import com.fr.module.Activator; +import com.fr.record.analyzer.EnableMetrics; +import com.fr.record.analyzer.Metrics; import com.fr.start.Designer; import com.fr.start.EnvSwitcher; import com.fr.start.SplashContext; @@ -17,9 +19,11 @@ import java.util.concurrent.Executors; /** * Created by juhaoyu on 2018/1/8. */ +@EnableMetrics public class DesignerStartup extends Activator { @Override + @Metrics public void start() { startSub(PreStartActivator.class); //启动基础部分