Browse Source

REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容

final/10.0
Harrison 6 years ago
parent
commit
2fd2f725ef
  1. 2
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
  2. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java
  3. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/StockSeriesPane.java
  4. 2
      designer-form/src/main/java/com/fr/design/designer/creator/XNumberEditor.java
  5. 4
      designer-form/src/main/java/com/fr/design/designer/properties/MultiSelectionBoundsModel.java
  6. 4
      designer-form/src/main/java/com/fr/design/designer/properties/VerticalBoxProperties.java
  7. 4
      designer-form/src/main/java/com/fr/design/designer/properties/VerticalSplitProperties.java
  8. 2
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
  9. 8
      designer-form/src/main/java/com/fr/design/mainframe/WLayoutSelectionPane.java
  10. 4
      designer-form/src/main/java/com/fr/design/mainframe/widget/editors/AdjustModeEditor.java
  11. 19
      designer-form/src/main/java/com/fr/design/mainframe/widget/editors/DimensionEditingPane.java
  12. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/ui/BasicSetVisiblePropertyPane.java
  13. 10
      designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnRowSizingAction.java
  14. 6
      designer-realize/src/main/java/com/fr/design/actions/columnrow/ColumnWidthAction.java
  15. 6
      designer-realize/src/main/java/com/fr/design/actions/columnrow/RowHeightAction.java
  16. 6
      designer-realize/src/main/java/com/fr/design/condition/BackPane.java
  17. 4
      designer-realize/src/main/java/com/fr/design/condition/ColumnWidthPane.java
  18. 8
      designer-realize/src/main/java/com/fr/design/condition/FontPane.java
  19. 8
      designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java
  20. 6
      designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java
  21. 2
      designer-realize/src/main/java/com/fr/design/condition/PagePane.java
  22. 4
      designer-realize/src/main/java/com/fr/design/condition/RowHeightPane.java
  23. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterEditPane.java
  24. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HeaderFooterPane.java
  25. 2
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
  26. 4
      designer-realize/src/main/java/com/fr/design/mainframe/SheetAuthorityEditPane.java
  27. 4
      designer-realize/src/main/java/com/fr/design/mainframe/SheetNameTabPane.java
  28. 10
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  29. 2
      designer-realize/src/main/java/com/fr/design/webattr/DragToolBarPane.java
  30. 4
      designer-realize/src/main/java/com/fr/design/webattr/EditReportServerParameterPane.java
  31. 2
      designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java
  32. 2
      designer-realize/src/main/java/com/fr/design/webattr/PageToolBarPane.java
  33. 2
      designer-realize/src/main/java/com/fr/design/webattr/ReportSelectToolBarPane.java
  34. 6
      designer-realize/src/main/java/com/fr/design/webattr/ReportWebWidgetConstants.java
  35. 2
      designer-realize/src/main/java/com/fr/design/webattr/ReportWriteAttrPane.java
  36. 2
      designer-realize/src/main/java/com/fr/design/webattr/WebJsPane.java
  37. 2
      designer-realize/src/main/java/com/fr/design/webattr/WriteToolBarPane.java
  38. 8
      designer-realize/src/main/java/com/fr/design/widget/WidgetPane.java
  39. 4
      designer-realize/src/main/java/com/fr/design/widget/ui/UserEditorDefinePane.java
  40. 41
      designer-realize/src/main/java/com/fr/grid/AbstractGridHeaderMouseHandler.java
  41. 48
      designer-realize/src/main/java/com/fr/grid/dnd/ElementCasePaneDropTarget.java
  42. 4
      designer-realize/src/main/java/com/fr/grid/selection/CellSelection.java
  43. 10
      designer-realize/src/main/java/com/fr/poly/PolyDesignUI.java
  44. 4
      designer-realize/src/main/java/com/fr/poly/group/PolyBoundsGroup.java
  45. 2
      designer-realize/src/main/java/com/fr/start/CollectUserInformationDialog.java

2
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);
}

2
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();

4
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 {
}
}
}
}

2
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")
});
}

4
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:

4
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;
}
}
}

4
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;
}
}
}

2
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@ -604,7 +604,7 @@ public class FormDesigner extends TargetComponent<Form> 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;
}

8
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());

4
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;
}
}
}

19
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);
}
}
}

2
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));

10
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);
}
}
}

6
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);
}
}
}

6
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);
}
}
}

6
designer-realize/src/main/java/com/fr/design/condition/BackPane.java

@ -47,9 +47,9 @@ public class BackPane extends ConditionAttrSingleConditionPane<HighlightAction>
});
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);

4
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);
}
}
}

8
designer-realize/src/main/java/com/fr/design/condition/FontPane.java

@ -52,9 +52,9 @@ public class FontPane extends ConditionAttrSingleConditionPane<HighlightAction>
});
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<HighlightAction>
public HighlightAction update() {
return new FRFontHighlightAction(this.frFontPreviewPane.getFontObject(), this.fontScopeComboBox.getSelectedIndex());
}
}
}

8
designer-realize/src/main/java/com/fr/design/condition/ForeGroundPane.java

@ -27,9 +27,9 @@ public class ForeGroundPane extends ConditionAttrSingleConditionPane<HighlightAc
this.add(foregroundLabel);
this.add(this.foregroundColorPane);
this.foreScopeComboBox = 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(this.foreScopeComboBox);
this.foregroundColorPane.setSelectObject(Color.black);
}
@ -52,4 +52,4 @@ public class ForeGroundPane extends ConditionAttrSingleConditionPane<HighlightAc
public HighlightAction update() {
return new ForegroundHighlightAction(this.foregroundColorPane.getSelectObject(), this.foreScopeComboBox.getSelectedIndex());
}
}
}

6
designer-realize/src/main/java/com/fr/design/condition/PaddingPane.java

@ -43,9 +43,9 @@ public class PaddingPane extends ConditionAttrSingleConditionPane<HighlightActio
this.add(paddingRight);
this.add(paddingRightSpinner);
this.paddingScopeComboBox = 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(this.paddingScopeComboBox);
this.paddingLeftSpinner.setValue(new Integer(0));
this.paddingRightSpinner.setValue(new Integer(0));

2
designer-realize/src/main/java/com/fr/design/condition/PagePane.java

@ -20,7 +20,7 @@ public class PagePane extends ConditionAttrSingleConditionPane<HighlightAction>
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"),

4
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);
}
}
}

2
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 {

2
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) {

2
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@ -701,7 +701,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
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());
}

4
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);
}
}
}

4
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();
}
}
}
}

10
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("<br></html></body>")) {
zeroMarginWarn.setText("<html><body>"+com.fr.design.i18n.Toolkit.i18nText("zeroMarginWarn")+"</body></html>");
zeroMarginWarn.setText("<html><body>"+com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Zero_Margin_Warn")+"</body></html>");
} 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);

2
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();

4
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());

2
designer-realize/src/main/java/com/fr/design/webattr/ErrorTemplatePane.java

@ -36,7 +36,7 @@ public class ErrorTemplatePane extends BasicBeanPane<String> {
{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"))}
};

2
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

2
designer-realize/src/main/java/com/fr/design/webattr/ReportSelectToolBarPane.java

@ -14,7 +14,7 @@ import java.awt.event.ActionListener;
public class ReportSelectToolBarPane<T> extends BasicBeanPane<T> {
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<T> editToolBarPane;

6
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

2
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

2
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);

2
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

8
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 "";
}
}
}

4
designer-realize/src/main/java/com/fr/design/widget/ui/UserEditorDefinePane.java

@ -23,7 +23,7 @@ public class UserEditorDefinePane extends AbstractDataModify<NameWidget> {
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<NameWidget> {
public NameWidget updateBean() {
return nWidget;
}
}
}

41
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();
}
}

48
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());
}
}
}

4
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);
}
}
}

10
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();
}
}
}

4
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:

2
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() {

Loading…
Cancel
Save