Browse Source

modify on 0809

final/10.0
Wim.Zhai 6 years ago
parent
commit
e2db16bc5f
  1. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java
  2. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java
  3. 2
      designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java
  4. 2
      designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java
  5. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java
  6. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java

2
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelBorderPane.java

@ -15,7 +15,7 @@ public class LabelBorderPane extends LabelBorderAttrPane {
protected AttrBorder attrBorder = new AttrBorder(); protected AttrBorder attrBorder = new AttrBorder();
public LabelBorderPane(ConditionAttributesPane conditionAttributesPane) { public LabelBorderPane(ConditionAttributesPane conditionAttributesPane) {
super(conditionAttributesPane, true, com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Border", "Format"})); super(conditionAttributesPane, true, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Format"));
} }
public void populate(DataSeriesCondition condition) { public void populate(DataSeriesCondition condition) {

4
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java

@ -43,8 +43,8 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane {
protected JPanel getContentInPlotType() { protected JPanel getContentInPlotType() {
unit = new UITextField(); unit = new UITextField();
angleMax = new UINumberDragPane(0, 360); angleMax = new UINumberDragPane(0, 360);
String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ge"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Unit_Hundred"), String[] orderUnit = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ge"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ten"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Hundred"),
com.fr.design.i18n.Toolkit.i18nText("Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Unit_Ten_Thousand")}; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Thousand"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Unit_Ten_Thousand")};
order = new UIComboBox(orderUnit); order = new UIComboBox(orderUnit);
colorPickerPane = createColorPickerPane(); colorPickerPane = createColorPickerPane();

2
designer-chart/src/main/java/com/fr/van/chart/bubble/VanChartBubbleSeriesPane.java

@ -78,7 +78,7 @@ public class VanChartBubbleSeriesPane extends VanChartAbstractPlotSeriesPane {
private JPanel createBubblePane() { private JPanel createBubblePane() {
bubblePane = new VanChartBubblePane(); bubblePane = new VanChartBubblePane();
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"), bubblePane); return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble"), bubblePane);
} }
protected void populateCondition(ConditionAttr defaultAttr){ protected void populateCondition(ConditionAttr defaultAttr){

2
designer-chart/src/main/java/com/fr/van/chart/bubble/component/VanChartBubblePane.java

@ -78,6 +78,6 @@ public class VanChartBubblePane extends BasicBeanPane<VanChartAttrBubble> {
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble");
} }
} }

4
designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartBubbleSetConditionPane.java

@ -18,7 +18,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi
@Override @Override
protected String getItemLabelString() { protected String getItemLabelString() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble");
} }
@Override @Override
@ -37,7 +37,7 @@ public class VanChartBubbleSetConditionPane extends AbstractNormalMultiLineCondi
*/ */
@Override @Override
public String nameForPopupMenuItem() { public String nameForPopupMenuItem() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Engine_Chart_Bubble");
} }
@Override @Override

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

@ -61,7 +61,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane<VanChart
Component[][] rangeComponents = new Component[][]{ Component[][] rangeComponents = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bottom_Value")),bottomValue}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bottom_Value")),bottomValue},
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-ChartF_TopValue")),topValue}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Top_Value")),topValue},
}; };
JPanel temp = TableLayoutHelper.createTableLayoutPane(rangeComponents, rowSize, columnSize); JPanel temp = TableLayoutHelper.createTableLayoutPane(rangeComponents, rowSize, columnSize);
JPanel rangePane = TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range"), temp); JPanel rangePane = TableLayout4VanChartHelper.createTableLayoutPaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range"), temp);

Loading…
Cancel
Save