From 2fd2f725efafe8d9516dc724e03b1e19cc143016 Mon Sep 17 00:00:00 2001 From: Harrison Date: Fri, 10 Aug 2018 10:05:02 +0800 Subject: [PATCH] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84=E8=8C=83?= =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PlotSeries/MapGroupExtensionPane.java | 2 +- .../gui/style/series/MeterSeriesPane.java | 2 +- .../gui/style/series/StockSeriesPane.java | 4 +- .../designer/creator/XNumberEditor.java | 2 +- .../properties/MultiSelectionBoundsModel.java | 4 +- .../properties/VerticalBoxProperties.java | 4 +- .../properties/VerticalSplitProperties.java | 4 +- .../com/fr/design/mainframe/FormDesigner.java | 2 +- .../mainframe/WLayoutSelectionPane.java | 8 ++-- .../widget/editors/AdjustModeEditor.java | 4 +- .../widget/editors/DimensionEditingPane.java | 19 ++++---- .../ui/BasicSetVisiblePropertyPane.java | 2 +- .../columnrow/ColumnRowSizingAction.java | 10 ++-- .../actions/columnrow/ColumnWidthAction.java | 6 +-- .../actions/columnrow/RowHeightAction.java | 6 +-- .../com/fr/design/condition/BackPane.java | 6 +-- .../fr/design/condition/ColumnWidthPane.java | 4 +- .../com/fr/design/condition/FontPane.java | 8 ++-- .../fr/design/condition/ForeGroundPane.java | 8 ++-- .../com/fr/design/condition/PaddingPane.java | 6 +-- .../com/fr/design/condition/PagePane.java | 2 +- .../fr/design/condition/RowHeightPane.java | 4 +- .../headerfooter/HeaderFooterEditPane.java | 2 +- .../design/headerfooter/HeaderFooterPane.java | 2 +- .../com/fr/design/mainframe/JWorkBook.java | 2 +- .../mainframe/SheetAuthorityEditPane.java | 4 +- .../fr/design/mainframe/SheetNameTabPane.java | 4 +- .../com/fr/design/report/PageSetupPane.java | 10 ++-- .../fr/design/webattr/DragToolBarPane.java | 2 +- .../EditReportServerParameterPane.java | 4 +- .../fr/design/webattr/ErrorTemplatePane.java | 2 +- .../fr/design/webattr/PageToolBarPane.java | 2 +- .../webattr/ReportSelectToolBarPane.java | 2 +- .../webattr/ReportWebWidgetConstants.java | 6 +-- .../design/webattr/ReportWriteAttrPane.java | 2 +- .../java/com/fr/design/webattr/WebJsPane.java | 2 +- .../fr/design/webattr/WriteToolBarPane.java | 2 +- .../java/com/fr/design/widget/WidgetPane.java | 8 ++-- .../widget/ui/UserEditorDefinePane.java | 4 +- .../grid/AbstractGridHeaderMouseHandler.java | 41 ++++++++-------- .../grid/dnd/ElementCasePaneDropTarget.java | 48 +++++++++---------- .../com/fr/grid/selection/CellSelection.java | 4 +- .../main/java/com/fr/poly/PolyDesignUI.java | 10 ++-- .../com/fr/poly/group/PolyBoundsGroup.java | 4 +- .../start/CollectUserInformationDialog.java | 2 +- 45 files changed, 140 insertions(+), 146 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java index f15f46d9c..4c6aa108c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java @@ -327,7 +327,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver { } private void showRenameWaring(String newName){ - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed") + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Has_Been_Existed") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE); } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index ce89dfd24..3542ea6e6 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -44,7 +44,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { unit = new UITextField(); angleMax = new UINumberDragPane(0, 360); String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), - com.fr.design.i18n.Toolkit.i18nText("Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; order = new UIComboBox(orderUnit); colorPickerPane = createColorPickerPane(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java index 72e89d6c7..75b274c7d 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java @@ -49,7 +49,7 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { double[] columnSize = { p,f }; double[] rowSize = { p,p,p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("UpBarBorderStyleAndColor")), null}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_UpBar_Border_Style_And_Color")), null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upLineBox}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Border-Color")), upBorderColor}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Line_Style")), upBackColor}, @@ -102,4 +102,4 @@ public class StockSeriesPane extends AbstractPlotSeriesPane { } } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java index 1d6711414..cadc4af75 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java @@ -73,7 +73,7 @@ public class XNumberEditor extends XWrapperedFieldEditor { .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_WaterMark")) .putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "Advanced"), new CRPropertyDescriptor("regErrorMessage", this.data.getClass()) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Verify-Message")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message")) .putKeyValue(XCreatorConstants.PROPERTY_VALIDATE, "FR-Designer_Validate") }); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java index 193fca4dc..c28f3d0ef 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java @@ -52,9 +52,9 @@ public class MultiSelectionBoundsModel implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("X-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_X_Coordinate"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Y-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Y_Coordinate"); case 2: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); default: diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java index efd9f9a50..9f6f59e34 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java @@ -29,7 +29,7 @@ public class VerticalBoxProperties implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("VerticalBoxLayout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Box_Layout_Duplicate"); } @Override @@ -99,4 +99,4 @@ public class VerticalBoxProperties implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java index a6f0e6af3..6b5996816 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java @@ -23,7 +23,7 @@ public class VerticalSplitProperties implements GroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("Vertical-Split_Layout"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Vertical_Split_Layout"); } @Override @@ -102,4 +102,4 @@ public class VerticalSplitProperties implements GroupModel { public boolean isEditable(int row) { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 617bfb4bc..3ef7a3961 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -604,7 +604,7 @@ public class FormDesigner extends TargetComponent
implements TreeSelection return false; } if (this.getTarget().isNameExist(newName)) { - JOptionPane.showMessageDialog(this, "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Utils-has_been_existed") + JOptionPane.showMessageDialog(this, "\"" + newName + "\"" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Has_Been_Existed") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alert"), JOptionPane.WARNING_MESSAGE); return false; } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java index 0189dbceb..bfe74d721 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java @@ -76,11 +76,11 @@ public class WLayoutSelectionPane extends BasicPane { public BorderLayoutPane() { this.setLayout(new /* */ GridLayout(1, 4, 5, 5)); KindPane b1 = new KindPane("/com/fr/web/images/form/layout_border_nc.png", new WBorderLayout(0, 0, new String[]{WBorderLayout.NORTH, WBorderLayout.CENTER})); - b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-LayoutContainer")); + b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WLayout_Border_Layout_Container")); KindPane b2 = new KindPane("/com/fr/web/images/form/layout_border_ncw.png", new WBorderLayout(0, 0, new String[]{WBorderLayout.WEST, WBorderLayout.NORTH, WBorderLayout.CENTER})); - b2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-ThreeContainer")); + b2.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WLayout_Border_Three_Container")); KindPane b4 = new KindPane("/com/fr/web/images/form/layout_border_all.png", new WBorderLayout(0, 0)); - b4.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Border-ToolTips")); + b4.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WLayout_Border_ToolTips")); this.add(b1); this.add(b2); this.add(b4); @@ -122,7 +122,7 @@ public class WLayoutSelectionPane extends BasicPane { public CardLayoutPane() { this.setLayout(new /* */ GridLayout(1, 4, 5, 5)); KindPane b1 = new KindPane("/com/fr/web/images/form/layout_absolute_big.png", new WCardLayout()); - b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("WLayout-Card-ToolTip")); + b1.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WLayout_Card_ToolTip")); this.add(b1); this.add(new UILabel()); this.add(new UILabel()); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java index d5e1ff93a..3de67f691 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java @@ -18,7 +18,7 @@ import com.fr.design.gui.icombobox.DictionaryComboBox; */ public class AdjustModeEditor extends AbstractPropertyEditor { public static final String[] AjustRowTypes = new String[] { - com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Utils-Row_Height"), com.fr.design.i18n.Toolkit.i18nText("Utils-Column_Width"), com.fr.design.i18n.Toolkit.i18nText("Default")}; + com.fr.design.i18n.Toolkit.i18nText("No"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width"), com.fr.design.i18n.Toolkit.i18nText("Default")}; private UIComboBox combobox; @@ -53,4 +53,4 @@ public class AdjustModeEditor extends AbstractPropertyEditor { public Component getCustomEditor() { return combobox; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java index 9d17e4199..918e5293d 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java @@ -1,15 +1,14 @@ package com.fr.design.mainframe.widget.editors; +import com.fr.design.dialog.BasicPane; +import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.layout.FRGUIPaneFactory; + +import javax.swing.JPanel; import java.awt.BorderLayout; import java.awt.Dimension; import java.awt.GridLayout; -import javax.swing.JPanel; - -import com.fr.design.gui.ispinner.UISpinner; -import com.fr.design.layout.FRGUIPaneFactory; -import com.fr.design.dialog.BasicPane; - public class DimensionEditingPane extends BasicPane { @@ -24,8 +23,8 @@ public class DimensionEditingPane extends BasicPane { private void initComponents() { setLayout(new/**/ GridLayout(2, 1)); - jLabel1 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Width") + ":"); - jLabel2 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Widget-Height") + ":"); + jLabel1 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widge_Width_Duplicate") + ":"); + jLabel2 = new com.fr.design.gui.ilable.UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Height_Duplicate") + ":"); spWidth = new UISpinner(0, Integer.MAX_VALUE, 1, 0); spHeight = new UISpinner(0, Integer.MAX_VALUE, 1, 0); @@ -46,7 +45,7 @@ public class DimensionEditingPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Widget-Sizing"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Sizing"); } public Dimension update() { @@ -57,4 +56,4 @@ public class DimensionEditingPane extends BasicPane { spWidth.setValue(d.width); spHeight.setValue(d.height); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java index 724e840aa..b7fbade3f 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java @@ -26,7 +26,7 @@ public class BasicSetVisiblePropertyPane extends FormBasicPropertyPane { if(otherOtherConfig != null){ pane2.add(otherOtherConfig); } - visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Widget-Visible"), true); + visibleCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible"), true); visibleCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Basic")); visibleCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnRowSizingAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnRowSizingAction.java index 10f62ba17..c9cc9e1b5 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnRowSizingAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnRowSizingAction.java @@ -78,16 +78,16 @@ public abstract class ColumnRowSizingAction extends AbstractColumnRowIndexAction float va; if (unitType == Constants.UNIT_CM) { va = unit.toCMValue4Scale2(); - uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Unit_CM")); + uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM")); } else if (unitType == Constants.UNIT_INCH) { va = unit.toINCHValue4Scale3(); - uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Unit_INCH")); + uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH")); } else if (unitType == Constants.UNIT_PT) { va = unit.toPTValue4Scale2(); - uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Unit_PT")); + uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT")); } else { va = unit.toMMValue4Scale2(); - uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Unit_MM")); + uPane.setUnitText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM")); } uPane.populate(va); @@ -117,4 +117,4 @@ public abstract class ColumnRowSizingAction extends AbstractColumnRowIndexAction return getIndexLen(this.getIndex(), report); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnWidthAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnWidthAction.java index bb7c84ebc..e363ee29e 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnWidthAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnWidthAction.java @@ -17,13 +17,13 @@ public class ColumnWidthAction extends ColumnRowSizingAction { public ColumnWidthAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Column_Width") + "..."); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width") + "..."); this.setMnemonic('C'); } @Override protected String title4UnitInputPane() { - return com.fr.design.i18n.Toolkit.i18nText("Utils-Column_Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width"); } @Override @@ -43,4 +43,4 @@ public class ColumnWidthAction extends ColumnRowSizingAction { int[] columns = cs.getSelectedColumns(); return getSelectedCellsLen(columns, report); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHeightAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHeightAction.java index 055cb8b5c..9485dc270 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHeightAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHeightAction.java @@ -17,13 +17,13 @@ public class RowHeightAction extends ColumnRowSizingAction { public RowHeightAction(ElementCasePane t, int indexOfColumnOrRow) { super(t, indexOfColumnOrRow); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Row_Height") + "..."); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height") + "..."); this.setMnemonic('R'); } @Override protected String title4UnitInputPane() { - return com.fr.design.i18n.Toolkit.i18nText("Utils-Row_Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height"); } @Override @@ -44,4 +44,4 @@ public class RowHeightAction extends ColumnRowSizingAction { return report.getRowHeight(index); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/condition/BackPane.java b/designer-realize/src/main/java/com/fr/design/condition/BackPane.java index e0513fe36..8ee6bedcd 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/BackPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/BackPane.java @@ -47,9 +47,9 @@ public class BackPane extends ConditionAttrSingleConditionPane }); this.backScopeComboBox = new UIComboBox(new String[] { - com.fr.design.i18n.Toolkit.i18nText("Utils-Current_Cell"), - com.fr.design.i18n.Toolkit.i18nText("Utils-Current_Row"), - com.fr.design.i18n.Toolkit.i18nText("Utils-Current_Column") }); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Current_Cell"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Current_Row"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Current_Column") }); this.add(backgroundLabel); this.add(backgroundPreviewPane); diff --git a/designer-realize/src/main/java/com/fr/design/condition/ColumnWidthPane.java b/designer-realize/src/main/java/com/fr/design/condition/ColumnWidthPane.java index ed399d6ec..426654f83 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/ColumnWidthPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/ColumnWidthPane.java @@ -13,7 +13,7 @@ import com.fr.stable.unit.UNIT; public class ColumnWidthPane extends WHPane { public ColumnWidthPane(ConditionAttributesPane conditionAttributesPane) { - super(conditionAttributesPane, com.fr.design.i18n.Toolkit.i18nText("Utils-Column_Width")); + super(conditionAttributesPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width")); } @Override @@ -25,4 +25,4 @@ public class ColumnWidthPane extends WHPane { protected HighlightAction returnAction(UNIT unit) { return new ColWidthHighlightAction(unit); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/condition/FontPane.java b/designer-realize/src/main/java/com/fr/design/condition/FontPane.java index 48e16140f..0f9ed57be 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/FontPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/FontPane.java @@ -52,9 +52,9 @@ public class FontPane extends ConditionAttrSingleConditionPane }); this.fontScopeComboBox = new UIComboBox(new String[] { - com.fr.design.i18n.Toolkit.i18nText("Utils-Current_Cell"), - com.fr.design.i18n.Toolkit.i18nText("Utils-Current_Row"), - com.fr.design.i18n.Toolkit.i18nText("Utils-Current_Column") }); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Current_Cell"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Current_Row"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Current_Column") }); this.add(fontLabel); this.add(frFontPreviewPane); @@ -77,4 +77,4 @@ public class FontPane extends ConditionAttrSingleConditionPane public HighlightAction update() { return new FRFontHighlightAction(this.frFontPreviewPane.getFontObject(), this.fontScopeComboBox.getSelectedIndex()); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java b/designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java index bd4336f65..713c33a3a 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java @@ -27,9 +27,9 @@ public class ForeGroundPane extends ConditionAttrSingleConditionPane pageLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Pagination") + ":"); this.add(pageLabel); this.pageComboBox = new UIComboBox(new String[] { - com.fr.design.i18n.Toolkit.i18nText("Utils-No_Pagination"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_No_Pagination"), com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_After_Row"), com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_Before_Row"), com.fr.design.i18n.Toolkit.i18nText("CellWrite-Page_After_Column"), diff --git a/designer-realize/src/main/java/com/fr/design/condition/RowHeightPane.java b/designer-realize/src/main/java/com/fr/design/condition/RowHeightPane.java index ec5c3192a..7aea6120c 100644 --- a/designer-realize/src/main/java/com/fr/design/condition/RowHeightPane.java +++ b/designer-realize/src/main/java/com/fr/design/condition/RowHeightPane.java @@ -15,7 +15,7 @@ public class RowHeightPane extends WHPane { private UIBasicSpinner rowHeightSpinner; public RowHeightPane(ConditionAttributesPane conditionAttributesPane) { - super(conditionAttributesPane, com.fr.design.i18n.Toolkit.i18nText("Utils-Row_Height")); + super(conditionAttributesPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height")); } @Override @@ -27,4 +27,4 @@ public class RowHeightPane extends WHPane { protected HighlightAction returnAction(UNIT unit) { return new RowHeightHighlightAction(unit); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java index b1e55bd3c..1da21d42d 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java @@ -631,7 +631,7 @@ public class HeaderFooterEditPane extends JPanel { private void setUnitType(int unitType) { if (unitType == Constants.UNIT_CM) { - unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Unit_CM")); + unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM")); } else if (unitType == Constants.UNIT_INCH) { unitLabel.setText(com.fr.design.i18n.Toolkit.i18nText("PageSetup-inches")); } else { diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java index c77fb505a..a0275ddd8 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java @@ -206,7 +206,7 @@ public abstract class HeaderFooterPane extends BasicPane { } else if (reportHFType == ReportConstants.REPORTPAGE_FIRST) { this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_First_Page")); } else if (reportHFType == ReportConstants.REPORTPAGE_LAST) { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Utils-Last_Page")); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Last_Page")); } else if (reportHFType == ReportConstants.REPORTPAGE_ODD) { this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Odd_Page")); } else if (reportHFType == ReportConstants.REPORTPAGE_EVEN) { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java index a300b835e..6fff792db 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java @@ -701,7 +701,7 @@ public class JWorkBook extends JTemplate { new ReportMobileAttrAction(this), new ReportPrintSettingAction(this), new ReportWatermarkAction(this), - new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Utils-Current_Sheet")), + new NameSeparator(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Current_Sheet")), }, this.reportComposite.getEditingReportComponent().shortcut4TemplateMenu()); } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java index 4f7ae3ec7..a853f7883 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java @@ -31,7 +31,7 @@ public class SheetAuthorityEditPane extends AuthorityEditPane { private static final int LEFT_GAP = 4; private static final int ALIGNMENT_GAP = -3; - private UICheckBox sheetVisible = new UICheckBox("sheet" + com.fr.design.i18n.Toolkit.i18nText("Widget-Visible")); + private UICheckBox sheetVisible = new UICheckBox("sheet" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_Visible")); private WorkBook workBook = null; private int selectedIndex = -1; private JPanel typePane; @@ -164,4 +164,4 @@ public class SheetAuthorityEditPane extends AuthorityEditPane { sheetVisible.addItemListener(itemListener); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java index a15df052f..03ea5fe0a 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java @@ -934,7 +934,7 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse // sheet名字的公式也需要做相应的变化. reportComposite.repaint(); } else { - JOptionPane.showMessageDialog(reportComposite, com.fr.design.i18n.Toolkit.i18nText("Utils-The_Name_has_been_existed")); + JOptionPane.showMessageDialog(reportComposite, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_The_Name_Has_Been_Existed")); } } } @@ -974,4 +974,4 @@ public class SheetNameTabPane extends JComponent implements MouseListener, Mouse reportComposite.fireTargetModified(); } } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index e6ba6da74..058c3ba1c 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -214,7 +214,7 @@ public class PageSetupPane extends BasicPane { ((JSpinner.DefaultEditor) paperHeightSpinner.getEditor()).getTextField().setColumns(7); unitLabel = new UnitFieldPane.UnitLabel(Constants.UNIT_MM, paperHeightSpinner.getPreferredSize().height); - String[] inch = {com.fr.design.i18n.Toolkit.i18nText("Unit_MM"), com.fr.design.i18n.Toolkit.i18nText("Unit_INCH")}; + String[] inch = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH")}; switchInch = new UIComboBox(inch); switchInch.setEditable(false); switchInch.setSize(paperHeightSpinner.getPreferredSize().width, paperHeightSpinner.getPreferredSize().height); @@ -643,7 +643,7 @@ public class PageSetupPane extends BasicPane { sbuf.append('x'); sbuf.append(Utils.convertNumberStringToString(new Float(paperSize.getHeight().toCMValue4Scale2()))); sbuf.append(' '); - sbuf.append(com.fr.design.i18n.Toolkit.i18nText("Unit_CM")); + sbuf.append(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM")); } else if (unitType == Constants.UNIT_INCH) { sbuf.append(Utils.convertNumberStringToString(new Float(paperSize.getWidth().toINCHValue4Scale3()))); sbuf.append('x'); @@ -844,7 +844,7 @@ public class PageSetupPane extends BasicPane { boolean or = isOr || rightValue; boolean isAnd = !topValue && !bottomValue && !leftValue ; if (or && (zeroMarginWarn.getText()).endsWith("
")) { - zeroMarginWarn.setText(""+com.fr.design.i18n.Toolkit.i18nText("zeroMarginWarn")+""); + zeroMarginWarn.setText(""+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Zero_Margin_Warn")+""); } else if (isAnd && !rightValue) { StringBuffer temp = new StringBuffer(); for (int i = 0; i < NUM_11; i++) { @@ -934,8 +934,8 @@ public class PageSetupPane extends BasicPane { JPanel autoShrinkPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); autoShrinkPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_PageSetup_Shrink_To_Fit_Content"))); isShrinkToFit4None = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("No")); - isShrinkToFit4Height = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Row_Height")); - isShrinkToFit4Width = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Column_Width")); + isShrinkToFit4Height = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Row_Height")); + isShrinkToFit4Width = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Column_Width")); ButtonGroup bp = new ButtonGroup(); autoShrinkPane.add(isShrinkToFit4None); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java index d80f90000..76440b943 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java @@ -91,7 +91,7 @@ public class DragToolBarPane extends WidgetToolBarPane { this.add(new JScrollPane(movePane), BorderLayout.CENTER); JPanel buttonPane = FRGUIPaneFactory.createCenterFlowInnerContainer_S_Pane(); - UIButton defaultButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Use_Default_ToolBar")); + UIButton defaultButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Use_Default_ToolBar")); defaultButton.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { southToolBar.removeAll(); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java b/designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java index 159db358a..a7f21c34c 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java @@ -54,8 +54,8 @@ public class EditReportServerParameterPane extends LoadingBasicPane { tabbedPane = new UITabbedPane(); defaultPane.add(tabbedPane, BorderLayout.CENTER); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("WEB-Pagination_Setting"), pagePane = new PageToolBarPane()); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("WEB-Write_Setting"), writePane = new WriteToolBarPane()); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WEB_Pagination_Setting"), pagePane = new PageToolBarPane()); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WEB_Write_Setting"), writePane = new WriteToolBarPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Data_Analysis_Settings"), viewPane = new ViewToolBarPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ReportServerP_Import_Css"), cssPane = new WebCssPane()); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("ReportServerP-Import_JavaScript"), jsPane = new WebJsPane()); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java index 99fccf44c..39954cd7a 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java @@ -36,7 +36,7 @@ public class ErrorTemplatePane extends BasicBeanPane { {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Template_Path") + ":"), reportletNamePane}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Template_Parameters") + ":"), null}, - {new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Verify-Message"))}, + {new UILabel("message" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Verify_Message"))}, {new UILabel("charset" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Server_Charset"))}, {new UILabel("exception" + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Exception_StackTrace"))} }; diff --git a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java index 982ba40b0..955e27417 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java @@ -107,7 +107,7 @@ public class PageToolBarPane extends AbstractEditToolBarPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("WEB-Pagination_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WEB_Pagination_Setting"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportSelectToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportSelectToolBarPane.java index e1c1fce89..08e0c4601 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportSelectToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportSelectToolBarPane.java @@ -14,7 +14,7 @@ import java.awt.event.ActionListener; public class ReportSelectToolBarPane extends BasicBeanPane { private UIRadioButton reportRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_I_Want_To_Set_Single")); - private UIRadioButton serverRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Using_Server_Report_View_Settings")); + private UIRadioButton serverRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Using_Server_Report_View_Settings")); private UIButton serverEditButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); EditToolBarPane editToolBarPane; diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java index c1ae8da70..37b33ffc1 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java @@ -126,9 +126,9 @@ public class ReportWebWidgetConstants { public static final WidgetOption NEW_PRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Print"), BaseUtils.readIcon("/com/fr/web/images/print.png"), NewPrint.class); public static final WidgetOption PRINT = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Engine_Print_Compatible"), BaseUtils.readIcon("/com/fr/web/images/print.png"), Print.class); - public static final WidgetOption APPENDCOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Utils-Insert_Record"), + public static final WidgetOption APPENDCOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Insert_Record"), BaseUtils.readIcon("/com/fr/web/images/appendRow.png"), AppendColumnRow.class); - public static final WidgetOption DELETECOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Utils-Delete_Record"), + public static final WidgetOption DELETECOLUMNROW = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Delete_Record"), BaseUtils.readIcon("/com/fr/web/images/deleteRow.png"), DeleteColumnRow.class); public static final WidgetOption VERIFY = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify"), BaseUtils.readIcon("/com/fr/web/images/verify.gif"), Verify.class); @@ -136,7 +136,7 @@ public class ReportWebWidgetConstants { BaseUtils.readIcon("/com/fr/web/images/save2.png"), SubmitForcibly.class); // show cell value - public static final WidgetOption SHOWCELLVALUE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Utils-Show_Cell_Value"), + public static final WidgetOption SHOWCELLVALUE = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Show_Cell_Value"), BaseUtils.readIcon("/com/fr/web/images/showValue.png"), ShowCellValue.class); // import excel data diff --git a/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java b/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java index 0ae8a1a6a..4da1a6b79 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java @@ -55,7 +55,7 @@ public class ReportWriteAttrPane extends LoadingBasicPane { tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Submit"), submiterListPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Verify-Data_Verify"), verifierListPane); - tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Writer-ShortCuts_Setting"), writeShortCutsPane); + tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Writer_ShortCuts_Setting"), writeShortCutsPane); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java index db9504342..d10ef5cb4 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java @@ -52,7 +52,7 @@ public class WebJsPane extends BasicPane { this.setBorder(BorderFactory.createEmptyBorder(10, 5, 0, 0)); localFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Disk_File") + ":", true); - urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Url_location")+ ":", false); + urlFileRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Url_Location")+ ":", false); ButtonGroup bg = new ButtonGroup(); bg.add(localFileRadioButton); bg.add(urlFileRadioButton); diff --git a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java index 983f92ea0..918d4ebb8 100644 --- a/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java +++ b/designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java @@ -146,7 +146,7 @@ public class WriteToolBarPane extends AbstractEditToolBarPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("WEB-Write_Setting"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_WEB_Write_Setting"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java index 01a8ee9d9..046643a50 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java @@ -177,8 +177,8 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener private static class EditorTypeComboBox extends UIComboBox { - private Item item = new Item(com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined"), - com.fr.design.i18n.Toolkit.i18nText("Widget-User_Defined")); + private Item item = new Item(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_User_Defined"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Widget_User_Defined")); public EditorTypeComboBox(boolean userDefined) { this.setEditable(false); @@ -188,7 +188,7 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener Object value, int index, boolean isSelected, boolean cellHasFocus) { if (value == item) { - UILabel label = new UILabel(Toolkit.i18nText("Widget-User_Defined") + UILabel label = new UILabel(Toolkit.i18nText("Fine-Design_Report_Widget_User_Defined") + " ————"); label.setEnabled(false); return label; @@ -301,4 +301,4 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener return ""; } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/design/widget/ui/UserEditorDefinePane.java b/designer-realize/src/main/java/com/fr/design/widget/ui/UserEditorDefinePane.java index 1cd6a300a..a9e5ee3d0 100644 --- a/designer-realize/src/main/java/com/fr/design/widget/ui/UserEditorDefinePane.java +++ b/designer-realize/src/main/java/com/fr/design/widget/ui/UserEditorDefinePane.java @@ -23,7 +23,7 @@ public class UserEditorDefinePane extends AbstractDataModify { FRFont frFont = FRContext.getDefaultValues().getFRFont(); infoLabel.setFont(new Font(frFont.getFamily(), Font.BOLD, 24)); infoLabel.setText(com.fr.design.i18n.Toolkit.i18nText( - "Widget-User_Defined_Editor") + "."); + "Fine-Design_Report_Widget_User_Defined_Editor") + "."); infoLabel.setHorizontalAlignment(SwingConstants.CENTER); this.add(infoLabel, BorderLayout.CENTER); @@ -43,4 +43,4 @@ public class UserEditorDefinePane extends AbstractDataModify { public NameWidget updateBean() { return nWidget; } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java b/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java index 5a988196d..1fe93129c 100644 --- a/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java +++ b/designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java @@ -1,29 +1,14 @@ package com.fr.grid; -import java.awt.BorderLayout; -import java.awt.Dimension; -import java.awt.Point; -import java.awt.Rectangle; -import java.awt.Toolkit; -import java.awt.event.MouseEvent; -import java.lang.reflect.Method; - -import javax.swing.JScrollBar; -import javax.swing.JToolTip; -import javax.swing.JWindow; -import javax.swing.SwingUtilities; -import javax.swing.event.MouseInputAdapter; - import com.fr.base.BaseUtils; import com.fr.base.DynamicUnitList; import com.fr.base.FRContext; import com.fr.base.ScreenResolution; -import com.fr.base.Utils; import com.fr.base.vcs.DesignerMode; import com.fr.design.DesignerEnvManager; import com.fr.design.gui.imenu.UIPopupMenu; import com.fr.design.mainframe.ElementCasePane; - +import com.fr.design.utils.gui.GUICoreUtils; import com.fr.grid.selection.CellSelection; import com.fr.grid.selection.FloatSelection; import com.fr.grid.selection.Selection; @@ -32,7 +17,19 @@ import com.fr.stable.ColumnRow; import com.fr.stable.Constants; import com.fr.stable.unit.FU; import com.fr.stable.unit.UNIT; -import com.fr.design.utils.gui.GUICoreUtils; + +import javax.swing.JScrollBar; +import javax.swing.JToolTip; +import javax.swing.JWindow; +import javax.swing.SwingUtilities; +import javax.swing.event.MouseInputAdapter; +import java.awt.BorderLayout; +import java.awt.Dimension; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.Toolkit; +import java.awt.event.MouseEvent; +import java.lang.reflect.Method; /** * @editor zhou @@ -308,19 +305,19 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter { if (unitType == Constants.UNIT_PT) { len = ulen.toPTValue4Scale2(); tlen = tulen.toPTValue4Scale2(); - unit = com.fr.design.i18n.Toolkit.i18nText("Unit_PT"); + unit = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT"); } else if (unitType == Constants.UNIT_CM) { len = ulen.toCMValue4Scale2(); tlen = tulen.toCMValue4Scale2(); - unit = com.fr.design.i18n.Toolkit.i18nText("Unit_CM"); + unit = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"); } else if (unitType == Constants.UNIT_INCH) { len = ulen.toINCHValue4Scale3(); tlen = tulen.toINCHValue4Scale3(); - unit = com.fr.design.i18n.Toolkit.i18nText("Unit_INCH"); + unit = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"); } else { len = ulen.toMMValue4Scale2(); tlen = tulen.toMMValue4Scale2(); - unit = com.fr.design.i18n.Toolkit.i18nText("Unit_MM"); + unit = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"); } StringBuilder sb = new StringBuilder(); sb.append(String.format("%.2f", new Double(len))) @@ -512,4 +509,4 @@ public abstract class AbstractGridHeaderMouseHandler extends MouseInputAdapter { protected abstract String nameOfSplitCursorGIF(); protected abstract String nameOfMoveCursorGIF(); -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/grid/dnd/ElementCasePaneDropTarget.java b/designer-realize/src/main/java/com/fr/grid/dnd/ElementCasePaneDropTarget.java index 8357a7eab..4547f32ba 100644 --- a/designer-realize/src/main/java/com/fr/grid/dnd/ElementCasePaneDropTarget.java +++ b/designer-realize/src/main/java/com/fr/grid/dnd/ElementCasePaneDropTarget.java @@ -1,25 +1,12 @@ package com.fr.grid.dnd; -import java.awt.Point; -import java.awt.datatransfer.DataFlavor; -import java.awt.datatransfer.Transferable; -import java.awt.dnd.DropTarget; -import java.awt.dnd.DropTargetAdapter; -import java.awt.dnd.DropTargetContext; -import java.awt.dnd.DropTargetDragEvent; -import java.awt.dnd.DropTargetDropEvent; -import java.awt.event.ActionEvent; - -import javax.swing.JOptionPane; -import javax.swing.JPopupMenu; - import com.fr.base.FRContext; import com.fr.design.actions.ToggleButtonUpdateAction; import com.fr.design.actions.UpdateAction; import com.fr.design.gui.ibutton.UIToggleButton; - -import com.fr.general.data.TableDataColumn; import com.fr.design.mainframe.ElementCasePane; +import com.fr.design.utils.gui.GUICoreUtils; +import com.fr.general.data.TableDataColumn; import com.fr.grid.Grid; import com.fr.grid.GridUtils; import com.fr.grid.selection.CellSelection; @@ -35,7 +22,18 @@ import com.fr.report.worksheet.FormElementCase; import com.fr.report.worksheet.WorkSheet; import com.fr.stable.ArrayUtils; import com.fr.stable.Constants; -import com.fr.design.utils.gui.GUICoreUtils; + +import javax.swing.JOptionPane; +import javax.swing.JPopupMenu; +import java.awt.Point; +import java.awt.datatransfer.DataFlavor; +import java.awt.datatransfer.Transferable; +import java.awt.dnd.DropTarget; +import java.awt.dnd.DropTargetAdapter; +import java.awt.dnd.DropTargetContext; +import java.awt.dnd.DropTargetDragEvent; +import java.awt.dnd.DropTargetDropEvent; +import java.awt.event.ActionEvent; /** * the class used for drop an element to the grid @@ -122,13 +120,13 @@ public class ElementCasePaneDropTarget extends DropTargetAdapter { public SortAction(int i) { direction = i; if (i == LEFT_2_RIGHT) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Left_to_Right_a")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Left_To_Right_Duplicate")); } else if (i == RIGHT_2_LEFT) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Right_to_Left")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Right_to_Left")); } else if (i == TOP_2_BOTTOM) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Top_to_Bottom_a")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom_Dupicate")); } else if (i == BOTTOM_2_TOP) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Utils-Bottom_to_Top")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Bottom_To_Top")); } this.setMnemonic('S'); } @@ -194,13 +192,13 @@ public class ElementCasePaneDropTarget extends DropTargetAdapter { if (direction == RIGHT_2_LEFT) { int k = cs.getColumn() - columnCount + 1; if (k < 0) { - JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Utils-Beyond_the_left_side_of_Border")); + JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Beyond_The_Left_Side_Of_Border")); return false; } } else if (direction == BOTTOM_2_TOP) { int k = cs.getRow() - columnCount + 1; if (k < 0) { - JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Utils-Beyond_the_top_side_of_Border")); + JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Beyond_The_Top_Side_Of_Border")); return false; } } @@ -208,12 +206,12 @@ public class ElementCasePaneDropTarget extends DropTargetAdapter { if (ePane.mustInVisibleRange()) { if (direction == LEFT_2_RIGHT) { if (!GridUtils.canMove(ePane, cs.getColumn() + columnCount - 1, cs.getRow())) { - JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Utils-Beyond_the_right_side_of_Border")); + JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Beyond_The_Right_Side_Of_Border")); return false; } } else if (direction == TOP_2_BOTTOM) { if (!GridUtils.canMove(ePane, cs.getRow(), cs.getColumn() + columnCount - 1)) { - JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Utils-Beyond_the_bottom_side_of_Border")); + JOptionPane.showMessageDialog(ePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Beyond_The_Bottom_Side_Of_Border")); return false; } } @@ -281,4 +279,4 @@ public class ElementCasePaneDropTarget extends DropTargetAdapter { dtde.acceptDrag(dtde.getDropAction()); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java b/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java index cff3f5ddc..27c6aaf0d 100644 --- a/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java +++ b/designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java @@ -385,7 +385,7 @@ public class CellSelection extends Selection { TemplateElementCase ec = ePane.getEditingElementCase(); Iterator cells = ec.intersect(column, row, columnSpan, rowSpan); if (cells.hasNext()) { // alex:有两个以上的格子在这个区域内 - int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Des-Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Utils-Merge_Cell"), + int returnValue = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(ePane), com.fr.design.i18n.Toolkit.i18nText("Des-Merger_Cell"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Merge_Cell"), JOptionPane.OK_CANCEL_OPTION); if (returnValue != JOptionPane.OK_OPTION) { return false; @@ -743,4 +743,4 @@ public class CellSelection extends Selection { CellWidgetPropertyPane.getInstance().reInit(ePane); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java b/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java index d740d3ab0..7270f868b 100644 --- a/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java +++ b/designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java @@ -206,16 +206,16 @@ public class PolyDesignUI extends ComponentUI { // int resolution = ScreenResolution.getScreenResolution(); if (unit == Constants.UNIT_MM) { Double j = (i + 2) * 1.0 * Constants.HUNDRED_FU_PER_INCH / Constants.HUNDRED_FU_PER_MM / resolution; - return j.intValue() + com.fr.design.i18n.Toolkit.i18nText("Unit_MM"); + return j.intValue() + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_MM"); } else if (unit == Constants.UNIT_CM) { Double j = (i + 2) * 1.0 * Constants.HUNDRED_FU_PER_INCH / Constants.HUNDRED_FU_PER_MM / resolution; - return new DecimalFormat("0.0").format(j.intValue() * 1.0 / TEN) + com.fr.design.i18n.Toolkit.i18nText("Unit_CM"); + return new DecimalFormat("0.0").format(j.intValue() * 1.0 / TEN) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_CM"); } else if (unit == Constants.UNIT_INCH) { Double j = i == 0 ? 0 : (i + 2) * 1.0 / resolution * HHUNDRED; - return new DecimalFormat("0.00").format(j.intValue() * 1.0 / HHUNDRED) + com.fr.design.i18n.Toolkit.i18nText("Unit_INCH"); + return new DecimalFormat("0.00").format(j.intValue() * 1.0 / HHUNDRED) + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_INCH"); } else if (unit == Constants.UNIT_PT) { int j = i == 0 ? 0 : (i + 2) * UNIT.PT_PER_INCH / resolution; - return j + com.fr.design.i18n.Toolkit.i18nText("Unit_PT"); + return j + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Unit_PT"); } else { return "" + i; } @@ -283,4 +283,4 @@ public class PolyDesignUI extends ComponentUI { } newG2D.dispose(); } -} \ No newline at end of file +} diff --git a/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java b/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java index ecaff93d8..cf3d8a691 100644 --- a/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java +++ b/designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java @@ -56,9 +56,9 @@ public class PolyBoundsGroup implements GroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("X-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_X_Coordinate"); case 1: - return com.fr.design.i18n.Toolkit.i18nText("Y-Coordinate"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Y_Coordinate"); case 2: return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); default: diff --git a/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java b/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java index b9f8b9125..c64e2bc9b 100644 --- a/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java +++ b/designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java @@ -161,7 +161,7 @@ public class CollectUserInformationDialog extends UIDialog { finishButton.setMnemonic('F'); buttonsPane.add(finishButton); finishButton.addActionListener(verifyActionListener); - UIButton exitButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Utils-Exit_Designer")); + UIButton exitButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Exit_Designer")); exitButton.setMnemonic('E'); buttonsPane.add(exitButton); exitButton.addActionListener(new ActionListener() {