diff --git a/designer-base/src/main/java/com/fr/conf/FitAttrState.java b/designer-base/src/main/java/com/fr/conf/FitAttrState.java index 9ad42fd6e..d02270db6 100644 --- a/designer-base/src/main/java/com/fr/conf/FitAttrState.java +++ b/designer-base/src/main/java/com/fr/conf/FitAttrState.java @@ -11,7 +11,7 @@ public enum FitAttrState { DEFAULT(0) { @Override public String description() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit_Default"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Default"); } }, @@ -19,21 +19,21 @@ public enum FitAttrState { HORIZONTAL_FIT(1) { @Override public String description() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit_Horizontal"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Horizontal"); } }, // 双向自适应, 横纵向都是根据页面宽高来计算 DOUBLE_FIT(2) { @Override public String description() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit_Horizontal_Vertical"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Horizontal_Vertical"); } }, NOT_FIT(3) { @Override public String description() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit_No"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-No"); } }; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/menupane/BrowserFitAttrPane.java b/designer-base/src/main/java/com/fr/design/mainframe/menupane/BrowserFitAttrPane.java index eeaa3047c..6b9db985d 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/menupane/BrowserFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/menupane/BrowserFitAttrPane.java @@ -74,9 +74,9 @@ public class BrowserFitAttrPane extends BasicBeanPane { ActionListener actionListener = getPreviewActionListener(); fontRadioGroup = new FontRadioGroup(); - fontFitRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Fit")); + fontFitRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit")); fontFitRadio.setSelected(true); - fontNotFitRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit_No")); + fontNotFitRadio = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-No")); addRadioToGroup(fontRadioGroup, fontFitRadio, fontNotFitRadio); fontRadioGroup.addActionListener(actionListener); @@ -96,8 +96,8 @@ public class BrowserFitAttrPane extends BasicBeanPane { protected Component[][] initFitComponents() { Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Fit-Font")), fontFitRadio, null, fontNotFitRadio}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Fit-Element")), defaultRadio, horizonRadio, doubleRadio, notFitRadio} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Font")), fontFitRadio, null, fontNotFitRadio}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Element")), defaultRadio, horizonRadio, doubleRadio, notFitRadio} }; return components; } @@ -110,7 +110,7 @@ public class BrowserFitAttrPane extends BasicBeanPane { private JPanel initGlobalOpsPane(final ReportFitAttr globalFitAttr) { final JPanel globalOpsPane = FRGUIPaneFactory.createRightFlowInnerContainer_S_Pane(); - globalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Use-Global")); + globalCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-UseGlobal")); globalOpsPane.add(globalCheck); globalCheck.addActionListener(new ActionListener() { @Override @@ -123,14 +123,14 @@ public class BrowserFitAttrPane extends BasicBeanPane { fitRadionGroup.selectIndexButton(attr.fitStateInPC()); fitPreviewPane.refreshPreview(getCurrentFitOptions(), fitRadionGroup.isEnabled()); remove(BrowserFitAttrPane.this.borderPane); - initBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Global")); + initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Global")); } else { ReportFitAttrProvider attr = localFitAttr; fontRadioGroup.selectFontFit(((ReportFitAttr) attr).isFitFont()); fitRadionGroup.selectIndexButton(attr.fitStateInPC()); fitPreviewPane.refreshPreview(getCurrentFitOptions(), fitRadionGroup.isEnabled()); remove(BrowserFitAttrPane.this.borderPane); - initBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Local")); + initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local")); } fontRadioGroup.setEnabled(isLocalConfig); fitRadionGroup.setEnabled(isLocalConfig); @@ -140,7 +140,7 @@ public class BrowserFitAttrPane extends BasicBeanPane { } }); - editGlobalOps = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Edit-Global")); + editGlobalOps = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-EditGlobal")); editGlobalOps.setVisible(false); editGlobalOps.addMouseListener(new MouseAdapter() { public void mouseClicked(MouseEvent evt) { @@ -165,7 +165,7 @@ public class BrowserFitAttrPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Attr-Set"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-AttrSet"); } @Override @@ -175,7 +175,7 @@ public class BrowserFitAttrPane extends BasicBeanPane { attr = ReportFitConfig.getInstance().getFrmFitAttr(); populateGlobalComponents(); } else { - initBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Local")); + initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local")); } this.localFitAttr = attr; fontRadioGroup.selectFontFit(((ReportFitAttr) attr).isFitFont()); @@ -188,7 +188,7 @@ public class BrowserFitAttrPane extends BasicBeanPane { fontRadioGroup.setEnabled(false); fitRadionGroup.setEnabled(false); editGlobalOps.setVisible(true); - initBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Global")); + initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Global")); } //有八种组合, 不过有意义的就是6种, 以此为key去缓存里找对应的预览图片 diff --git a/designer-base/src/main/java/com/fr/design/mainframe/menupane/FitPreviewPane.java b/designer-base/src/main/java/com/fr/design/mainframe/menupane/FitPreviewPane.java index fbc12c3b3..68d268136 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/menupane/FitPreviewPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/menupane/FitPreviewPane.java @@ -67,7 +67,7 @@ public class FitPreviewPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Preview"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Preview"); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrAction.java b/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrAction.java index 3c4d977fa..fd4a4e3cf 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrAction.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrAction.java @@ -28,7 +28,7 @@ public class ReportFitAttrAction extends JTemplateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit-Template"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Template"); } @Override @@ -44,7 +44,7 @@ public class ReportFitAttrAction extends JTemplateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit-Elementcase"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Elementcase"); } @Override @@ -67,7 +67,7 @@ public class ReportFitAttrAction extends JTemplateAction { } this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setMnemonic(getMenuKeySet().getMnemonic()); - this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/fit.png")); + this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/reportfit/fit.png")); } /** diff --git a/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrPane.java b/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrPane.java index 27faf6fa8..32de70550 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/menupane/ReportFitAttrPane.java @@ -50,7 +50,7 @@ public class ReportFitAttrPane extends BasicBeanPane { * @return 标题 */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateBrowserFitAttrPane.java b/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateBrowserFitAttrPane.java index e37ce09a3..420306f5f 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateBrowserFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateBrowserFitAttrPane.java @@ -21,8 +21,8 @@ public class TemplateBrowserFitAttrPane extends BrowserFitAttrPane { @Override protected Component[][] initFitComponents() { Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Fit-Font")), fontFitRadio, null, fontNotFitRadio}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Fit-Element")), horizonRadio, doubleRadio, notFitRadio} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Font")), fontFitRadio, null, fontNotFitRadio}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Element")), horizonRadio, doubleRadio, notFitRadio} }; return components; } @@ -41,9 +41,9 @@ public class TemplateBrowserFitAttrPane extends BrowserFitAttrPane { } else if (fitAttr.fitStateInPC() == 0) { attr = new ReportFitAttr(); attr.setFitStateInPC(3); - initBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Local")); + initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local")); } else { - initBorderPane(com.fr.design.i18n.Toolkit.i18nText("FR-Plugin_Local")); + initBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Local")); } this.localFitAttr = attr; fontRadioGroup.selectFontFit((attr).isFitFont()); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateFitAttrPane.java b/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateFitAttrPane.java index 675af9c54..a24140f02 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateFitAttrPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/menupane/TemplateFitAttrPane.java @@ -50,6 +50,6 @@ public class TemplateFitAttrPane extends BasicBeanPane { * @return 标题 */ protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit-Attr"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-Attr"); } } diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit/fit.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/fit.png new file mode 100644 index 000000000..9f6dd87b9 Binary files /dev/null and b/designer-base/src/main/resources/com/fr/design/images/reportfit/fit.png differ diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/00.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/00.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/00.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/00.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/10.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/10.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/10.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/10.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/11.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/11.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/11.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/11.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/20.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/20.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/20.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/20.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/21.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/21.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/21.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/21.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/30.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/30.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/30.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/30.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/00.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/00.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/00.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/00.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/10.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/10.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/10.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/10.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/11.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/11.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/11.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/11.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/20.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/20.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/20.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/20.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/21.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/21.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/21.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/21.png diff --git a/designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/30.png b/designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/30.png similarity index 100% rename from designer-base/src/main/resources/com/fr/design/images/reportfit.preview/gray/30.png rename to designer-base/src/main/resources/com/fr/design/images/reportfit/preview/gray/30.png diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index b755edec7..a6d7e1480 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -504,7 +504,7 @@ public class JForm extends JTemplate implements BaseJForm { @Override public ShortCut[] shortcut4TemplateMenu() { if (this.index == FORM_TAB) { - return (ShortCut[]) ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new ReportFitAttrAction(this), new ReportFitAttrAction(this)}, new ShortCut[0]); + return (ShortCut[]) ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new ReportFitAttrAction(this)}, new ShortCut[0]); } else { return (ShortCut[]) ArrayUtils.addAll(new ShortCut[]{new TemplateParameterAction(this), new ReportFitAttrAction(this)}, this.elementCaseDesign.shortcut4TemplateMenu()); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java index 1ffa7a0e1..3eee63f9e 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/propertypane/BrowserFitPropertyEditor.java @@ -25,7 +25,7 @@ public class BrowserFitPropertyEditor { } try { CRPropertyDescriptor propertyDescriptors = new CRPropertyDescriptor("fitStateInPC", temp).setEditorClass(BrowserFitEditor.class) - .setRendererClass(BrowserFitRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Fit-In-Web")) + .setRendererClass(BrowserFitRender.class).setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Fit-In-Web")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"); return propertyDescriptors; } catch (IntrospectionException e) {