Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Merge pull request #347 in DESIGN/design from ~WIM.ZHAI/design:release/10.0 to release/10.0 

针对CHART-2753发现的bug。在design-i18n-chart新增了些key定义（可能是原先以为engine-chart里有，就没有保留，但事后发现engine处的key无法被design处代码获得）

* commit '3d81dc7d7eeb07a09d5902f369c151510a105c70':
  modify for 2753
  change0807:
final/10.0
Wim.Zhai 6 years ago
parent
73481babe9 3d81dc7d7e
commit
eef3cd6f56
47 changed files with 52 additions and 54 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. 4
      designer-base/src/main/java/com/fr/design/gui/style/BackgroundPane.java
  2. 2
      designer-chart/src/main/java/com/fr/design/chart/report/MapCubeSetDataPane.java
  3. 2
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java
  4. 2
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java
  5. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java
  6. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/MapDataLabelPane.java
  7. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/BubblePlotTableDataContentPane.java
  8. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/SeriesNameUseFieldValuePane.java
  9. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/table/XYScatterPlotTableDataContentPane.java
  10. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
  11. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4GisPane.java
  12. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDataPointLabel4MapPane.java
  13. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartDatapointLabelPane.java
  14. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  15. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/AreaPlotPane.java
  16. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/BarPlotPane.java
  17. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/type/ColumnPlotPane.java
  18. 2
      designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java
  19. 2
      designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java
  20. 2
      designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java
  21. 2
      designer-chart/src/main/java/com/fr/van/chart/column/ColumnBorderAttriPane.java
  22. 2
      designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java
  23. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java
  24. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java
  25. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartMarkerBackgroundPane.java
  26. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithRadiusPane.java
  27. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/format/MapAreaNameFormatPaneWithCheckBox.java
  28. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/format/SeriesNameFormatPaneWithCheckBox.java
  29. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/format/ValueFormatPaneWithCheckBox.java
  30. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java
  31. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java
  32. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/background/radar/VanChartRadarAlertValuePane.java
  33. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/label/VanChartPlotLabelPane.java
  34. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipNoCheckPane.java
  35. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/tooltip/VanChartPlotTooltipPane.java
  36. 2
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttReportDataContentPane.java
  37. 2
      designer-chart/src/main/java/com/fr/van/chart/gantt/designer/data/data/component/GanttTableDataContentPane.java
  38. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/AreaPane.java
  39. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java
  40. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/AreaPane.java
  41. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java
  42. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java
  43. 2
      designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java
  44. 4
      designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java
  45. 2
      designer-chart/src/main/java/com/fr/van/chart/multilayer/other/VanChartMultiPiePlotTooltipNoCheckPane.java
  46. 2
      designer-chart/src/main/java/com/fr/van/chart/scatter/component/tooltip/VanChartScatterPlotTooltipNoCheckPane.java
  47. 2
      designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java

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

@ -1,11 +1,9 @@
package com.fr.design.gui.style;
import com.fr.base.BaseUtils;
import com.fr.base.Style;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.constants.LayoutConstants;
import com.fr.design.fun.BackgroundQuickUIProvider;
import com.fr.design.gui.ibutton.UIToggleButton;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.layout.TableLayout;
@ -74,7 +72,7 @@ public class BackgroundPane extends AbstractBasicStylePane {
double p = TableLayout.PREFERRED;
Component[][] components = new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill") + " ", SwingConstants.LEFT),typeComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill") + " ", SwingConstants.LEFT),typeComboBox},
new Component[]{null, centerPane}
};
double[] rowSize = {p, p, p};

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

@ -36,7 +36,7 @@ public class MapCubeSetDataPane extends BasicBeanPane<List>{
private void initCom() {
this.setLayout(new BorderLayout(0, 0));
UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Map")}, new int[] {}) {
UIArrayTableModel model = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Drill_Map")}, new int[] {}) {
public boolean isCellEditable(int row, int col) {
return col != 0;
}

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

@ -86,7 +86,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane<String> implements Abstrc
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Field")+":"));
northPane.add(columnBox);
tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")}, new int[]{}) {
tableEditorModel = new UIArrayTableModel(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Use_Field"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")}, new int[]{}) {
public boolean isCellEditable(int row, int col) {
return col != 0;
}

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

@ -259,7 +259,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
}
private JMenuItem createMarkerItem(final String oldName) {
JMenuItem editMarkerItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Image", "Marker"}));
JMenuItem editMarkerItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Image_Marker"));
editMarkerItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) {
final MapCustomPane image = new MapCustomPane();

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

@ -71,7 +71,7 @@ public class DataLabelPane extends TooltipContentsPane {
if (showSeriesNameCB == null) {
showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
}
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Include"}) + ":"), showSeriesNameCB};
return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Include") + ":"), showSeriesNameCB};
}
protected Component[] createComponents4ShowCategoryName() {

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

@ -23,7 +23,7 @@ public class MapDataLabelPane extends DataLabelPane {
@Override
protected String getCategoryString() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name");
}
@Override

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

@ -55,7 +55,7 @@ public class BubblePlotTableDataContentPane extends AbstractTableDataContentPane
double[] columnSize_north = {p, f};
double[] rowSize_north = {p, p, p, p};
Component[][] components_north = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName},
new Component[]{new UILabel("x"), xCombox},
new Component[]{new UILabel("y"), yCombox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize}

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

@ -95,7 +95,7 @@ public class SeriesNameUseFieldValuePane extends FurtherBasicBeanPane<ChartColle
double f = TableLayout.FILL;
double[] columnSize = {f};
double[] rowSize = {p, p, p, p};
UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"));
UILabel Label1 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
Label1.setPreferredSize(new Dimension(75, 20));
UILabel Label2 = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Value"));
Label2.setPreferredSize(new Dimension(75, 20));

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

@ -51,7 +51,7 @@ public class XYScatterPlotTableDataContentPane extends AbstractTableDataContentP
double[] rowSize = { p,p,p,p,p,p};
Component[][] components = new Component[][]{
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name") + ":"),seriesName},
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name") + ":"),seriesName},
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "x" + ":"), xCombox},
new Component[]{new BoldFontTextLabel(" " + com.fr.design.i18n.Toolkit.i18nText("Chart-Scatter_Name") + "y" + ":"), yCombox},
new Component[]{new JSeparator(),null},

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

@ -154,7 +154,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
isChartAnimation = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Animation_JSShow"));
isSeriesDragEnable = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Drag"));
isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"));
isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
dataPointValueFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
isDatapointPercent = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Value_Percent"));
dataPointPercentFormat = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));

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

@ -41,7 +41,7 @@ public class ChartDataPointLabel4GisPane extends ChartDatapointLabelPane{
isAddress.setSelected(true);
isAddressName = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Address_Name"));
isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"));
isDatapointValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));
divideComoBox = new UIComboBox(ChartConstants.DELIMITERS);

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

@ -30,7 +30,7 @@ public class ChartDataPointLabel4MapPane extends ChartDatapointLabelPane {
this.parent = parent;
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_Label"));
isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"));
isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"));
isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Value"));
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));

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

@ -98,8 +98,8 @@ public class ChartDatapointLabelPane extends BasicPane{
if(plot.isSupportCategoryFilter()) {
isCategory = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Category_Name"));
}
isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"));
isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value"));
isSeries = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
isValue = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value"));
isValue.setSelected(true);
valueFormatButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Format"));

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

@ -94,7 +94,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private void initMin() {
// 最小值.
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value"));
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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("Fine-Design_Report_Parameter_Formula"));
@ -110,7 +110,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private void initMax() {
// 最大值
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value"));
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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("Fine-Design_Report_Parameter_Formula"));

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

@ -35,7 +35,7 @@ public class AreaPlotPane extends AbstractChartTypePane{
protected String[] getTypeTipName() {
String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area");
String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D");
return new String[]{
stack + area,

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

@ -33,7 +33,7 @@ public class BarPlotPane extends AbstractBarPane{
protected String[] getTypeTipName() {
String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar");
String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D");
return new String[]{
bar,

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

@ -32,7 +32,7 @@ public class ColumnPlotPane extends AbstractBarPane{
protected String[] getTypeTipName() {
String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column");
String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
String td = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Chart_3D");
return new String[]{
column,

2
designer-chart/src/main/java/com/fr/van/chart/area/VanChartAreaPlotPane.java
Unescape View File

@ -29,7 +29,7 @@ public class VanChartAreaPlotPane extends AbstractVanChartTypePane {
protected String[] getTypeTipName() {
String area = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Area");
String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
return new String[]{
area,
stack + area,

2
designer-chart/src/main/java/com/fr/van/chart/bar/VanChartBarPlotPane.java
Unescape View File

@ -29,7 +29,7 @@ public class VanChartBarPlotPane extends AbstractVanChartTypePane {
protected String[] getTypeTipName() {
String bar = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Bar");
String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
return new String[]{
bar,
stack + bar,

2
designer-chart/src/main/java/com/fr/van/chart/bubble/data/VanChartBubblePlotTableDataContentPane.java
Unescape View File

@ -56,7 +56,7 @@ public class VanChartBubblePlotTableDataContentPane extends AbstractTableDataCon
double[] rowSize_north = {p, p, p, p};
Component[][] components_north = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesName},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesName},
new Component[]{new UILabel("x" ), xCombox},
new Component[]{new UILabel("y"), yCombox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_Bubble_Size")), bubbleSize},

2
designer-chart/src/main/java/com/fr/van/chart/column/ColumnBorderAttriPane.java
Unescape View File

@ -14,7 +14,7 @@ public class ColumnBorderAttriPane extends BorderAttriPane {
private UISpinner radius;
public ColumnBorderAttriPane() {
this(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius"));
this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius"));
}
public ColumnBorderAttriPane(String radiusString) {

2
designer-chart/src/main/java/com/fr/van/chart/column/VanChartColumnPlotPane.java
Unescape View File

@ -30,7 +30,7 @@ public class VanChartColumnPlotPane extends AbstractVanChartTypePane {
protected String[] getTypeTipName() {
String column = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Column");
String stack = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Stacked");
String percent = com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Use_Percent");
String percent = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Percent");
return new String[]{
column,
stack + column,

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

@ -99,7 +99,7 @@ public class VanChartBackgroundPane extends BasicPane {
return new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{null, centerPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow},

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

@ -23,10 +23,10 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg
radius = new UISpinner(0,1000,1,0);
return new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{null, centerPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
};
}

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

@ -33,7 +33,7 @@ public class VanChartMarkerBackgroundPane extends VanChartBackgroundPane {
protected Component[][] getPaneComponents() {
return new Component[][]{
new Component[]{null, null},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Fill")), typeComboBox},
new Component[]{null, centerPane},
};
}

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

@ -30,7 +30,7 @@ public class VanChartBorderWithRadiusPane extends VanChartBorderPane {
new Component[]{null,null},
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("FR-Chart-Color_Color")),currentLineColorPane},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius}
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")),radius}
} ;
}

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

@ -16,6 +16,6 @@ public class MapAreaNameFormatPaneWithCheckBox extends CategoryNameFormatPaneWit
@Override
protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name");
}
}

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

@ -18,6 +18,6 @@ public class SeriesNameFormatPaneWithCheckBox extends VanChartFormatPaneWithChec
@Override
protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name");
}
}

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

@ -18,6 +18,6 @@ public class ValueFormatPaneWithCheckBox extends VanChartFormatPaneWithCheckBox
@Override
protected String getCheckBoxText() {
return com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value");
}
}

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

@ -199,7 +199,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
private void initMin() {
// 最小值.
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Min_Value"}));
minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Min_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));
@ -214,7 +214,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
private void initMax() {
// 最大值
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Max_Value"}));
maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Max_Value"));
Date tmp = null;
DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Date"), UIDatePicker.STYLE_CN_DATETIME1);
Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Formula"));

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

@ -104,7 +104,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
protected Component[][] getTopPaneComponents() {
return new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertAxis},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")),alertValue},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor},
};

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

@ -14,7 +14,7 @@ public class VanChartRadarAlertValuePane extends VanChartAlertValuePane {
protected Component[][] getTopPaneComponents() {
return new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Use_Value")),alertValue},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Value")),alertValue},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),alertLineStyle},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),alertLineColor},
};

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

@ -31,7 +31,7 @@ public class VanChartPlotLabelPane extends BasicPane {
public VanChartPlotLabelPane(Plot plot, VanChartStylePane parent) {
this.parent = parent;
this.plot = plot;
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseLabel"));
isLabelShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Label"));
labelPane = new JPanel(new BorderLayout(0, 4));
createLabelPane();
addComponents();

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

@ -18,7 +18,7 @@ public class VanChartPlotTooltipNoCheckPane extends VanChartPlotTooltipPane {
}
protected void addComponents(Plot plot) {
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
tooltipPane = createTooltipPane(plot);
this.setLayout(new BorderLayout());

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

@ -50,7 +50,7 @@ public class VanChartPlotTooltipPane extends BasicPane {
}
protected void addComponents(Plot plot) {
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
tooltipPane = createTooltipPane(plot);
double p = TableLayout.PREFERRED;

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

@ -40,7 +40,7 @@ public class GanttReportDataContentPane extends AbstractReportDataContentPane{
}
private void initAllComponent() {
seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name"));
seriesName = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name"));
startTime = createTinyFormulaPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time"));

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

@ -68,7 +68,7 @@ public class GanttTableDataContentPane extends AbstractTableDataContentPane{
double[] col = {p,f};
Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Series_Name")), seriesComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")), seriesComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Start_Time")), startTimeComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_End_Time")), endTimeComboBox},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Time")), markerTimeComboBox},

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/AreaPane.java
Unescape View File

@ -37,7 +37,7 @@ public class AreaPane extends AbstractReportDataContentPane {
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaName}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaName}
};
}

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/report/LongLatAreaPane.java
Unescape View File

@ -42,7 +42,7 @@ public class LongLatAreaPane extends AreaPane {
return new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitude},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitude},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaName}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaName}
};
}

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/AreaPane.java
Unescape View File

@ -52,7 +52,7 @@ public class AreaPane extends AbstractTableDataContentPane {
protected Component[][] getComponent () {
return new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaNameCom}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaNameCom}
};
}

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/component/table/LongLatAreaPane.java
Unescape View File

@ -44,7 +44,7 @@ public class LongLatAreaPane extends AreaPane {
return new Component[][]{
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Longitude")), longitudeCom},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_Latitude")), latitudeCom},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name")), areaNameCom}
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name")), areaNameCom}
};
}

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/report/VanAreaMapPlotReportDataContentPane.java
Unescape View File

@ -36,7 +36,7 @@ public class VanAreaMapPlotReportDataContentPane extends AbstractReportDataConte
protected void initLayout() {
this.setLayout(new BorderLayout(4, 0));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"));
UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"));
label.setPreferredSize(new Dimension(75, 20));
this.add(label, BorderLayout.WEST);

2
designer-chart/src/main/java/com/fr/van/chart/map/designer/data/contentpane/table/VanAreaMapPlotTableDataContentPane.java
Unescape View File

@ -63,7 +63,7 @@ public class VanAreaMapPlotTableDataContentPane extends AbstractTableDataContent
}
protected JPanel createAreaNamePane() {
UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Area_Name"));
UILabel label = new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Area_Name"));
label.setPreferredSize(new Dimension(80, 20));
areaNameCom.setPreferredSize(new Dimension(100, 20));

4
designer-chart/src/main/java/com/fr/van/chart/map/designer/type/VanChartMapPlotPane.java
Unescape View File

@ -20,7 +20,7 @@ import java.awt.Component;
* Created by Mitisky on 16/5/4.
*/
public class VanChartMapPlotPane extends AbstractVanChartTypePane {
public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap");
public static final String TITLE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map");
private VanChartMapSourceChoosePane sourceChoosePane;
@ -60,7 +60,7 @@ public class VanChartMapPlotPane extends AbstractVanChartTypePane {
*/
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_NewMap");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_New_Map");
}
protected Component[][] getPaneComponents(JPanel typePane){

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

@ -18,7 +18,7 @@ public class VanChartMultiPiePlotTooltipNoCheckPane extends VanChartMultiPiePlot
}
protected void addComponents(Plot plot) {
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
tooltipPane = createTooltipPane(plot);
this.setLayout(new BorderLayout());

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

@ -19,7 +19,7 @@ public class VanChartScatterPlotTooltipNoCheckPane extends VanChartScatterPlotTo
}
protected void addComponents(Plot plot) {
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_UseTooltip"));
isTooltipShow = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Use_Tooltip"));
tooltipPane = createTooltipPane(plot);
this.setLayout(new BorderLayout());

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

@ -401,7 +401,7 @@ public class LayoutBorderPane extends BasicPane {
}
protected JComponent[] getBorderCornerSpinnerComp(){
return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")+":"),borderCornerSpinner};
return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Radius")+":"),borderCornerSpinner};
}
protected void switchBorderType(){

Write Preview
Loading…
Cancel
Save