fanruan
/
design
6
0
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

occur a bug..

research/10.0
Wim.Zhai 6 years ago
parent
66108f7767
commit
e29537648a
72 changed files with 97 additions and 104 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
  2. 2
      designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
  3. 2
      designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
  4. 2
      designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java
  5. 2
      designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
  6. 2
      designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
  7. 6
      designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
  8. 4
      designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java
  9. 5
      designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
  10. 2
      designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
  11. 2
      designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java
  12. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
  13. 2
      designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
  14. 8
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  15. 2
      designer-base/src/main/java/com/fr/design/style/AlphaPane.java
  16. 2
      designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java
  17. 6
      designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
  18. 4
      designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
  19. 2
      designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
  20. 2
      designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java
  21. 2
      designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java
  22. 2
      designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
  23. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java
  24. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java
  25. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
  26. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java
  27. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java
  28. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
  29. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
  30. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/PieDataLabelPane.java
  31. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java
  32. 6
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  33. 2
      designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java
  34. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
  35. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  36. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
  37. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
  38. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
  39. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  40. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java
  41. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java
  42. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java
  43. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java
  44. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java
  45. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java
  46. 2
      designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
  47. 2
      designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java
  48. 2
      designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java
  49. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java
  50. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java
  51. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
  52. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java
  53. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
  54. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java
  55. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
  56. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java
  57. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
  58. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java
  59. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java
  60. 2
      designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java
  61. 2
      designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java
  62. 2
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
  63. 2
      designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java
  64. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java
  65. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java
  66. 6
      designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
  67. 2
      designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java
  68. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
  69. 10
      designer-realize/src/main/java/com/fr/design/expand/ParentPane.java
  70. 2
      designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
  71. 2
      designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
  72. 2
      designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java

2
designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java
Unescape View File

@ -42,7 +42,7 @@ public class AboutDialog extends JDialog implements ActionListener {
JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane();
this.setContentPane(defaultPane);
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK"));
okButton.addActionListener(this);
tabbedPane = new UITabbedPane();

2
designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java
Unescape View File

@ -68,7 +68,7 @@ public class FeedBackPane extends BasicPane {
private static final String ALLOWED_INTEGER_TYPE = "0123456789";
private SwingWorker worker;
private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true);
private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK"));
private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
private int ifHasBeenWriten = 0;
private UITextArea detailField;

2
designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java
Unescape View File

@ -48,7 +48,7 @@ public abstract class DatabaseConnectionPane<E extends com.fr.data.impl.Connecti
newCharSetComboBox = new UIComboBox(EncodeConstants.ALL_ENCODING_ARRAY);
message = new UILabel();
uiLabel = new UILabel();
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK"));
cancelButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel northPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();

2
designer-base/src/main/java/com/fr/design/dialog/InformationWarnPane.java
Unescape View File

@ -149,7 +149,7 @@ public class InformationWarnPane extends JPanel{
private JPanel createControlButtonPane() {
controlPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("OK") + "</font></html>") {
okButton = new UIButton("<html><font FACE='MicroSoft YaHei'>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK") + "</font></html>") {
@Override
public Dimension getPreferredSize() {
// TODO Auto-generated method stub

2
designer-base/src/main/java/com/fr/design/dialog/UIDialog.java
Unescape View File

@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog {
}
private void addOkButton(JPanel buttonsPane) {
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK"));
okButton.setName(OK_BUTTON);
okButton.setMnemonic('O');
buttonsPane.add(okButton);

2
designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java
Unescape View File

@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel {
gap.setPreferredSize(new Dimension(26,1));
sPane.add(gap);
UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")) {
UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")) {
public Dimension getPreferredSize() {
return new Dimension(32,18);
}

6
designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java
Unescape View File

@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
this.add(selectTreeDataPanel, BorderLayout.NORTH);
valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()});
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
formulaEditor.setEnabled(true);
textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor});
Component[][] coms = {
@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe
String[] columnNames = new String[namelist.size()];
namelist.toArray(columnNames);
valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]);
} catch (Exception e) {
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
}

4
designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java
Unescape View File

@ -17,7 +17,7 @@ public class DictionaryConstants {
"^\\d{6}$" };
public final static String[] regexpsDisplays = new String[] {
com.fr.design.i18n.Toolkit.i18nText("None"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"),
com.fr.design.i18n.Toolkit.i18nText("Required"),
com.fr.design.i18n.Toolkit.i18nText("Length"),
com.fr.design.i18n.Toolkit.i18nText("Float"),
@ -55,7 +55,7 @@ public class DictionaryConstants {
};
public static final String[] symbolDisplays = new String[]{
com.fr.design.i18n.Toolkit.i18nText("None"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"),
com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"),
com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes")
};

5
designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java
Unescape View File

@ -10,7 +10,6 @@ import java.awt.FontMetrics;
import java.awt.Graphics;
import java.awt.Graphics2D;
import java.awt.geom.GeneralPath;
import java.awt.geom.Line2D;
import java.awt.geom.Point2D;
import javax.swing.DefaultComboBoxModel;
@ -20,8 +19,6 @@ import javax.swing.JList;
import com.fr.base.FRContext;
import com.fr.base.GraphHelper;
import com.fr.base.ScreenResolution;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer;
import com.fr.general.FRFont;
import com.fr.stable.Constants;
@ -91,7 +88,7 @@ public class LineComboBox extends UIComboBox {
FontMetrics fm = GraphHelper.getFontMetrics(rfont);
if (style == Constants.LINE_NONE) {
//draw "none" string
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent());
} else {
GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style);
}

2
designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java
Unescape View File

@ -106,7 +106,7 @@ public class UISBChooser extends JDialog {
JButton b = new JButton("Cancel");
b.addActionListener(new CancelAction());
p3.add(b);
b = new JButton("OK");
b = new JButton("Fine-Design_Chart_OK");
getRootPane().setDefaultButton(b);
b.addActionListener(new OKAction());
p3.add(b);

2
designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java
Unescape View File

@ -57,7 +57,7 @@ public class TableLayoutTest extends JFrame
UITextField textfieldState = new UITextField(2);
UITextField textfieldZip = new UITextField(5);
UIButton buttonOk = new UIButton("OK");
UIButton buttonOk = new UIButton("Fine-Design_Chart_OK");
UIButton buttonCancel = new UIButton("Cancel");
JPanel panelButton = new JPanel();
panelButton.add(buttonOk);

2
designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java
Unescape View File

@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor {
case DataControl.TYPE_NUMBER:
return new DoubleEditor();
case DataControl.TYPE_FORMULA:
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
case DataControl.TYPE_DATABINDING:
return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
case DataControl.TYPE_STRING:

2
designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java
Unescape View File

@ -35,7 +35,7 @@ public class BackgroundWrapper implements Encoder, Decoder {
} else if (v instanceof GradientBackground) {
return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color");
} else {
return com.fr.design.i18n.Toolkit.i18nText("None");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None");
}
}

8
designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
Unescape View File

@ -4,13 +4,9 @@
package com.fr.design.menu;
import com.fr.general.ComparatorUtils;
import com.fr.general.GeneralContext;
import javax.swing.*;
import java.awt.event.KeyEvent;
import java.util.Locale;
import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
@ -883,7 +879,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink");
}
@Override
@ -994,7 +990,7 @@ public class KeySetUtils {
@Override
public String getMenuName() {
return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert-Float");
}
@Override

2
designer-base/src/main/java/com/fr/design/style/AlphaPane.java
Unescape View File

@ -50,7 +50,7 @@ public class AlphaPane extends JPanel {
alphaPane.setBorder(BorderFactory.createEmptyBorder());
this.add(alphaPane, BorderLayout.CENTER);
alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha") + ":"));
alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha") + ":"));
alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE));
alphaSlider.setPreferredSize(new Dimension(80, 20));

2
designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java
Unescape View File

@ -98,7 +98,7 @@ public class ColorSelectDialog extends MiddleChartDialog{
buttonPane.add(ok);
buttonPane.add(cancel);
ok.setActionCommand("OK");
ok.setActionCommand("Fine-Design_Chart_OK");
ok.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
seletePane.setColor(okListener.getColor());

6
designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java
Unescape View File

@ -21,9 +21,9 @@ import java.awt.*;
public class DateValuePane extends JPanel {
private UIButtonGroup widgetValueHead;
private Editor[] editor;
private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("None");
private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None");
private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date");
private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula");
private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula");
public DateValuePane() {
@ -45,7 +45,7 @@ public class DateValuePane extends JPanel {
@Override
public void stateChanged(ChangeEvent e) {
int index = widgetValueHead.getSelectedIndex();
if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("None"))) {
if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"))) {
customPane.setVisible(false);
} else {
customPane.setVisible(true);

4
designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java
Unescape View File

@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog {
this.setModal(true);
this.setLayout(new BorderLayout());
final ChartTypePane chartTypePane = new ChartTypePane();
setTitle(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType"));
setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type"));
this.applyClosingAction();
this.applyEscapeAction();
@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog {
this.add(buttonPane, BorderLayout.SOUTH);
ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK"));
cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel"));
buttonPane.add(ok);

2
designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java
Unescape View File

@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane {
JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane);
spane.setDividerLocation(120);
spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType")));
spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type")));
this.add(spane);
iconViewList.setSelectedIndex(0);

2
designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java
Unescape View File

@ -10,7 +10,7 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane {
}
protected String getValueAxisName() {
return com.fr.design.i18n.Toolkit.i18nText("Main_Axis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis");
}
protected String getSecondValueAxisName() {

2
designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java
Unescape View File

@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane {
private ColorSelectBox colorSelectBox;
public BorderAttriPane() {
this(com.fr.design.i18n.Toolkit.i18nText("Line-Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color"));
}
public BorderAttriPane(String lineString, String colorSting) {

2
designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java
Unescape View File

@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction {
public SetChartStyleAciton(ChartComponent chartComponent) {
super(chartComponent);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"));
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"));
}
public void actionPerformed(ActionEvent e) {

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java
Unescape View File

@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit
TextEditor textEidtor = new TextEditor();
initListeners(textEidtor);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
initListeners(formulaEditor);
Editor[] editors = new Editor[]{textEidtor, formulaEditor};

2
designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java
Unescape View File

@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer {
private ValueEditorPane cellEditor;
public MapReportRenderer() {
Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"))};
Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"))};
cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors);
}

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
Unescape View File

@ -58,7 +58,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
namePane.add(nameLabel = new UITextField("", 6));
pane.add(linePane = new BorderAttriPane());
linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Line-Style"}), null));
linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Line_Style"), null));
JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
pane.add(typePane);

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java
Unescape View File

@ -29,7 +29,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane<DataSer
super(conditionAttributesPane, isRemove);
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style") + ":");
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style") + ":");
if (isRemove) {
this.add(nameLabel);
}
@ -40,7 +40,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane<DataSer
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("Line-Style");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style");
}
@Override

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java
Unescape View File

@ -37,7 +37,7 @@ public class Bar2DDataLabelPane extends DataLabelPane {
outSideButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(outSideButton);
buttonPane.add(insideButton);
buttonPane.add(centerButton);

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java
Unescape View File

@ -32,7 +32,7 @@ public class BubbleDataLabelPane extends DataLabelPane {
outSideButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("+ \":\"") + ":"));
buttonPane.add(outSideButton);
buttonPane.add(insideButton);

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
Unescape View File

@ -127,7 +127,7 @@ public class DataLabelPane extends TooltipContentsPane {
topButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(bottomButton);
buttonPane.add(leftButton);
buttonPane.add(rigtButton);

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/PieDataLabelPane.java
Unescape View File

@ -66,7 +66,7 @@ public class PieDataLabelPane extends DataLabelPane {
insideButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(insideButton);
buttonPane.add(outSideButton);

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/RangeDataLabelPane.java
Unescape View File

@ -32,7 +32,7 @@ public class RangeDataLabelPane extends DataLabelPane {
topButton.setSelected(true);
JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Layout"}) + ":"));
buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":"));
buttonPane.add(topButton);
buttonPane.add(bottomButton);
buttonPane.add(centerButton);

6
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
Unescape View File

@ -59,12 +59,12 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
floatNameBox.setPreferredSize(new Dimension(90, 20));
JPanel pane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float") + ":"));
pane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert-Float") + ":"));
pane.add(floatNameBox);
Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
Font font = null;
TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "M_Insert-Float"}), 4, 2, font, new Color(1, 159, 222));
TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-M_Insert_Float_Related"), 4, 2, font, new Color(1, 159, 222));
// 圆角不行
centerPane.setBorder(border);
@ -144,7 +144,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "M_Insert-Float"});
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-M_Insert_Float_Related");
}
public static class ChartNoRename extends ChartHyperRelateFloatLinkPane {

2
designer-chart/src/main/java/com/fr/design/gui/xcombox/MarkerComboBox.java
Unescape View File

@ -73,7 +73,7 @@ public class MarkerComboBox extends UIComboBox {
g2d.setFont(rfont);
FontMetrics fm = GraphHelper.getFontMetrics(rfont);
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 12, (d.height - fm.getHeight()) / 2 + fm.getAscent());
GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), 12, (d.height - fm.getHeight()) / 2 + fm.getAscent());
} else {
if (marker.getBackground() == null) {
marker.setBackground(ColorBackground.getInstance(Color.black));

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java
Unescape View File

@ -119,7 +119,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
}
private JPanel createTitleStylePane() {
final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
styleAttrPane = new ChartTextAttrPane() {
protected JPanel getContentPane(JPanel buttonPane) {
double p = TableLayout.PREFERRED;

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
Unescape View File

@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{
axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
axisLineColor = new ColorSelectBox(100);
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")};
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")};
Integer[] valueArray = {Constants.TICK_MARK_OUTSIDE, Constants.TICK_MARK_INSIDE, Constants.TICK_MARK_CROSS, Constants.TICK_MARK_NONE};
Icon[] iconArray = {BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/external.png"),
BaseUtils.readIcon("/com/fr/design/images/chart/ChartAxisLineStyle/inside.png"),
@ -55,7 +55,7 @@ public class ChartAxisLineStylePane extends BasicPane{
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} ,
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("MainGraduationLine")),null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null},
new Component[]{null, mainTickPosition},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null},
new Component[]{null,secondTickPosition}

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
Unescape View File

@ -17,7 +17,7 @@ public class ChartBeautyPane extends BasicBeanPane<Integer>{
public ChartBeautyPane() {
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"),
com.fr.design.i18n.Toolkit.i18nText("Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"),
com.fr.design.i18n.Toolkit.i18nText("TopDownShade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格，注意兼容处理
};

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
Unescape View File

@ -34,7 +34,7 @@ public class ChartBorderPane extends BasicPane{
double[] columnSize = { p,f };
double[] rowSize = {p, p, p, p};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")+":"),currentLineCombo},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane},
new Component[]{null,isRoundBorder}
} ;

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java
Unescape View File

@ -165,7 +165,7 @@ public class ChartTextAttrPane extends BasicPane {
}
protected Component[][] getComponents(JPanel buttonPane) {
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
return new Component[][]{
new Component[]{null, null},
new Component[]{text, fontNameComboBox},

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
Unescape View File

@ -97,7 +97,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor};
minValueField = new ValueEditorPane(editor);
minValueField.setEnabled(false);
@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
Editor[] editor = new Editor[]{dateEditor, formulaEditor};
maxValueField = new ValueEditorPane(editor);
maxValueField.setEnabled(false);
@ -126,7 +126,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private void initMain() {
// 主要刻度单位
mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("MainGraduationUnit"));
mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Unit"));
mainUnitField = new UITextField();
mainUnitField.setPreferredSize(new Dimension(30, 20));
mainUnitField.setEditable(false);

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java
Unescape View File

@ -30,7 +30,7 @@ public class Area3DSeriesPane extends AbstractPlotSeriesPane {
JPanel pane = new JPanel();
pane.setLayout(new BorderLayout());
pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pitch_Percentage") + ":"), BorderLayout.WEST);
pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pitch_Percentage") + ":"), BorderLayout.WEST);
pane.add(gapPane = new UINumberDragPane(0, 500), BorderLayout.CENTER);
gapPane.populateBean(100.0);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java
Unescape View File

@ -249,9 +249,9 @@ public class CustomDefaultSeriesPane extends BasicPane{
double[] rowSize = { p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
};
this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.NORTH);

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java
Unescape View File

@ -458,9 +458,9 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane<CustomAttr>{
Component[][] components = new Component[][]{
new Component[]{positionPane, null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
};
this.setLayout(new BorderLayout());

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java
Unescape View File

@ -58,9 +58,9 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{
double[] rowSize = { p,p,p,p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak}
};
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java
Unescape View File

@ -36,7 +36,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane {
protected void initCom() {
stylePane = new ChartBeautyPane();
isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot"));
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")};
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")};
Integer[] valueArray = {0, 1};
secondPlotType = new UIButtonGroup<Integer>(nameArray, valueArray);
smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1));

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java
Unescape View File

@ -57,7 +57,7 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle },
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")),isNullValueBreak}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak}
} ;
return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize);
}

2
designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java
Unescape View File

@ -112,7 +112,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane {
private JPanel createHyperlinkPane() {
hyperLinkPane = new ExtendedChartHyperLinkPane();
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperLinkPane);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperLinkPane);
}
@Override

2
designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java
Unescape View File

@ -32,7 +32,7 @@ public class VanChartCustomInteractivePane extends VanChartInteractivePane {
protected JPanel createHyperlinkPane() {
hyperlinkPane = new VanChartCustomPlotHyperlinkPane();
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperlinkPane);
}
@Override

2
designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java
Unescape View File

@ -68,6 +68,6 @@ public class VanChartCustomTooltipPane extends BasicScrollPane<Chart> {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip");
}
}

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java
Unescape View File

@ -38,7 +38,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane {
};
transparent = new UINumberDragPane(0, 100);
JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha"), transparent);
JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), transparent);
this.setLayout(new BorderLayout());
this.add(fillColorPane, BorderLayout.NORTH);

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java
Unescape View File

@ -28,7 +28,7 @@ public class VanChartBeautyPane extends BasicBeanPane<Integer> {
double[] columnSize = {f, e};
double[] rowSize = {p};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Style")), styleBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style")), styleBox},
} ;
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize);
this.setLayout(new BorderLayout());

2
designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java
Unescape View File

@ -192,7 +192,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem
}
private void addOkButton(JPanel buttonsPane) {
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK"));
okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK"));
buttonsPane.add(okButton);
okButton.addActionListener(new ActionListener() {

4
designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java
Unescape View File

@ -45,7 +45,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane {
Component[][] components = new Component[][]{
new Component[]{gradientBar, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Direction")),directionPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Direction")),directionPane},
};
JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
this.setLayout(new BorderLayout());
@ -99,7 +99,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane {
* @return 名称
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Color");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color");
}
}

2
designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java
Unescape View File

@ -259,7 +259,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane<Chart> {
protected JPanel createHyperlinkPane() {
superLink = new VanChartHyperLinkPane();
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), superLink);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), superLink);
}

4
designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java
Unescape View File

@ -33,12 +33,12 @@ public class VanChartDataSheetContentPane extends AbstractNormalMultiLineConditi
@Override
public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet");
}
@Override
protected String getItemLabelString() {
return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet");
}
@Override

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java
Unescape View File

@ -68,7 +68,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
Component[][] styleComponents = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),color},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha")),transparent},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")),transparent},
};
temp = TableLayoutHelper.createTableLayoutPane(styleComponents, rowSize, columnSize);
JPanel stylePane = TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Style_Name"), temp);

4
designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartGaugeCateOrPercentLabelDetailPane.java
Unescape View File

@ -88,7 +88,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
protected Component[][] getLabelStyleComponents(Plot plot) {
initGaugeStyle(plot);
if (gaugeStyle == GaugeStyle.RING || gaugeStyle == GaugeStyle.SLOT) {
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
return new Component[][]{
new Component[]{text,style},
new Component[]{textFontPane,null},
@ -124,7 +124,7 @@ public class VanChartGaugeCateOrPercentLabelDetailPane extends VanChartGaugeLabe
}
protected Component[][] getComponents(JPanel buttonPane) {
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
return new Component[][]{
new Component[]{text, fontNameComboBox},
new Component[]{null, buttonPane}

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelDetailPane.java
Unescape View File

@ -180,7 +180,7 @@ public class VanChartPlotLabelDetailPane extends BasicPane {
}
protected Component[][] getLabelStyleComponents(Plot plot) {
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT);
UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT);
return new Component[][]{
new Component[]{null,null},
new Component[]{text,style},

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java
Unescape View File

@ -118,7 +118,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
}
};
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), style);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), style);
JPanel panel1 = new JPanel(new BorderLayout());
panel1.add(panel, BorderLayout.CENTER);
panel1.add(textFontPane, BorderLayout.SOUTH);

2
designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartTooltipPane.java
Unescape View File

@ -71,7 +71,7 @@ public class VanChartTooltipPane extends AbstractVanChartScrollPane<Chart> {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip");
}
protected VanChartPlotTooltipPane getTooltipPane(Plot plot) {

2
designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java
Unescape View File

@ -96,7 +96,7 @@ public class DrillMapLayerPane extends BasicScrollPane<ChartCollection> {
detailComps = new Component[depth + 1][3];
rowSize[0] = p;
detailComps[0] = new Component[]{
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Descriptor")),
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Descriptor")),
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")),
new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Map_Type"))
};

2
designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java
Unescape View File

@ -83,7 +83,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith
double[] rowSize = {p,p,p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{null},
new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), textAttrPane)},
new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), textAttrPane)},
new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane)},
new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Select_Color"), selectBackgroundPane)},
new Component[]{catalogSuperLink}

2
designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java
Unescape View File

@ -53,7 +53,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane {
private JPanel createGanntStylePane(){
seriesNewLine = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")});
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_New_Line"),seriesNewLine);
JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"), panel);
JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"), panel);
return ganntStylePane;
}

2
designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java
Unescape View File

@ -67,7 +67,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane {
private JPanel createGaugeLayoutPane() {
gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")});
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation"),gaugeLayout);
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Page_Setup_Orientation"),gaugeLayout);
gaugeLayout.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java
Unescape View File

@ -23,7 +23,7 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo
@Override
protected JPanel createHyperlinkPane() {
hyperlinkPane = new VanChartMapHyperLinkPane();
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperlinkPane);
}
@Override
protected void populateHyperlink(Plot plot) {

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java
Unescape View File

@ -123,7 +123,7 @@ public class VanChartMapTooltipPane extends AbstractVanChartScrollPane<Chart> {
@Override
protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip");
}
}

6
designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java
Unescape View File

@ -69,7 +69,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
this.add(selectTreeDataPanel, BorderLayout.NORTH);
valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))});
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
formulaEditor.setEnabled(true);
textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor});
Component[][] coms = {
@ -99,12 +99,12 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab
String[] columnNames = new String[namelist.size()];
namelist.toArray(columnNames);
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
} catch (Exception e) {
valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1);
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
formulaEditor.setEnabled(true);
textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1);
}

2
designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java
Unescape View File

@ -39,7 +39,7 @@ public class BorderLayoutDirectionEditor extends AbstractPropertyEditor {
setText(StringUtils.join("、", res));
}
} else {
setText(com.fr.design.i18n.Toolkit.i18nText("None"));
setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"));
}
return this;
}

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java
Unescape View File

@ -69,7 +69,7 @@ public class FormWidgetValuePane extends JPanel {
case DataControl.TYPE_NUMBER:
return new DoubleEditor();
case DataControl.TYPE_FORMULA:
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"));
return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"));
case DataControl.TYPE_DATABINDING:
return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor();
case DataControl.TYPE_STRING:

10
designer-realize/src/main/java/com/fr/design/expand/ParentPane.java
Unescape View File

@ -117,9 +117,9 @@ public class ParentPane extends BasicPane {
}
});
noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("None"));
noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"));
noneParentText.setRectDirection(Constants.RIGHT);
parentCardPane.add("None", noneParentText);
parentCardPane.add("Fine-Design_Chart_None", noneParentText);
defaultParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Default"));
defaultParentText.setRectDirection(Constants.RIGHT);
parentCardPane.add("Default", defaultParentText);
@ -174,7 +174,7 @@ public class ParentPane extends BasicPane {
private UIPopupMenu createPopMenu() {
UIPopupMenu pop = new UIPopupMenu();
pop.setOnlyText(true);
UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("None"));
UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"));
if (cellAttrPaneListener != null) {
noneItem.addActionListener(cellAttrPaneListener);
}
@ -182,7 +182,7 @@ public class ParentPane extends BasicPane {
@Override
public void actionPerformed(ActionEvent e) {
cardLayout.show(parentCardPane, "None");
cardLayout.show(parentCardPane, "Fine-Design_Chart_None");
}
});
@ -241,7 +241,7 @@ public class ParentPane extends BasicPane {
this.cardLayout.show(parentCardPane, "Custom");
this.customParentColumnRowPane.populate(columnRow);
} else {
this.cardLayout.show(parentCardPane, "None");
this.cardLayout.show(parentCardPane, "Fine-Design_Chart_None");
this.customParentColumnRowPane.populate(ColumnRow.valueOf(0, 0));
}
}

2
designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java
Unescape View File

@ -433,7 +433,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane {
} else if (selectionType == CellSelection.CHOOSE_COLUMN) {
type.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Column"));
} else {
type.setText(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float"));
type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert-Float"));
}
}

2
designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java
Unescape View File

@ -159,7 +159,7 @@ public class PageSetupPane extends BasicPane {
this.add(defaultPane, BorderLayout.NORTH);
JPanel twoPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane();
twoPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation"));
JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Page_Setup_Orientation"));
JPanel innerorientationPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane();
orientationPane.add(innerorientationPane);
twoPane.add(orientationPane);

2
designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java
Unescape View File

@ -305,7 +305,7 @@ public abstract class CellQuickEditor extends QuickEditor<ElementCasePane> {
ColumnRow columnRowEdit = ColumnRow.valueOf(columnRowTextField.getText());
// barry:检查输入是否正确
if (!ColumnRow.validate(columnRowEdit)) {
Object[] options = {com.fr.design.i18n.Toolkit.i18nText("OK")};
Object[] options = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")};
JOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Please_Input_Letters+Numbers(A1,AA1,A11....)"), com.fr.design.i18n.Toolkit.i18nText("Warning"),
JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]);
// 重新选中当前的selection,把columnRowTextField

Write Preview
Loading…
Cancel
Save