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

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

CHART-2868 createTableLayoutPane4Chart()的参数也用到了国际化。修改了几处两次使用i8nText方法的地方

* commit '047acda40768dd72215b74573f469d09203e5e61':
  change unused modify
  CHART-2876 Debug on i18n
  right or wrong?
final/10.0
Wim.Zhai 6 years ago
parent
fd42272fc1 047acda407
commit
e1322f2dae
17 changed files with 43 additions and 43 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/extra/exe/callback/InstallFromDiskCallback.java
  2. 2
      designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
  3. 2
      designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
  4. 2
      designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
  5. 14
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/ChartInteractivePane.java
  6. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  7. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBackgroundPane.java
  8. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java
  9. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java
  10. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartFillStylePane.java
  11. 8
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java
  12. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/area/DefaultAxisAreaPane.java
  13. 16
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java
  14. 16
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
  15. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Donut2DSeriesPane.java
  16. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/VanChartPlotLegendPane.java
  17. 2
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellStylePane.java

2
designer-base/src/main/java/com/fr/design/extra/exe/callback/InstallFromDiskCallback.java
Unescape View File

@ -42,7 +42,7 @@ public class InstallFromDiskCallback extends AbstractPluginTaskCallback {
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence")),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Install_Dependence"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,

2
designer-base/src/main/java/com/fr/design/extra/exe/callback/UninstallPluginCallback.java
Unescape View File

@ -30,7 +30,7 @@ public class UninstallPluginCallback extends AbstractPluginTaskCallback {
}else if (result.errorCode() == PluginErrorCode.NeedUninstallDependingPluginFirst) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence")),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Delete_Dependence"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,

2
designer-base/src/main/java/com/fr/design/extra/exe/callback/UpdateFromDiskCallback.java
Unescape View File

@ -42,7 +42,7 @@ public class UpdateFromDiskCallback extends AbstractPluginTaskCallback {
} else if (result.errorCode() == PluginErrorCode.NeedDealWithPluginDependency) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence")),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Update_Dependence"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Warning"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,

2
designer-base/src/main/java/com/fr/design/extra/tradition/callback/UpdateOnlineCallback.java
Unescape View File

@ -36,7 +36,7 @@ public class UpdateOnlineCallback implements ProgressCallback {
} else if (result.errorCode() == PluginErrorCode.OperationNotSupport) {
int rv = JOptionPane.showOptionDialog(
null,
com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence")),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Dependence"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Install_Success"),
JOptionPane.YES_NO_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE,

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

@ -316,7 +316,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
new Component[]{tooltipShowTypeLabel, tooltipShowType},
new Component[]{tooltipStyleLabel, tooltipStyle}
};
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize);
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize);
}
private void relayoutDataPointToolTipPane(Plot plot) {
@ -338,7 +338,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
new Component[]{isAddressTittle, tmpButton},
new Component[]{isDatapointValue, dataPointValueFormat},
};
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize);
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize);
} else if (plot.isSupportValuePercent()) {
Component[][] components;
if (plot.isSupportTooltipSeriesType()) {
@ -357,13 +357,13 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
getTooltipStyleComponent()
};
}
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize);
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize);
} else {
Component[][] components = new Component[][]{
new Component[]{isDatapointValue, dataPointValueFormat},
getTooltipStyleComponent()
};
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartData-Tooltip"}, components, rowSize, columnSize);
tooltipPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Point_Tooltip"}, components, rowSize, columnSize);
}
}
@ -396,7 +396,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
Component[][] components = new Component[][]{
new Component[]{isAxisShowToolTip},
};
axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Axis", "Chart-Interactive"}, components, rowSize, columnSize);
axisShowPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Interactive"}, components, rowSize, columnSize);
}
private void initAutoRefreshPane() {
@ -414,7 +414,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
}, 1)},
new Component[]{new UILabel("<html><font size='2' face='Microsoft Yahei' color='red'>" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Not_Support_Img_And_Cell") + "</font></html>"), null},
};
autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data-Check"}, components, rowSize, columnSize);
autoRefreshPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Data_Check"}, components, rowSize, columnSize);
}
private void initSuperlinkPane() {
@ -426,7 +426,7 @@ public class ChartInteractivePane extends BasicScrollPane<Chart> implements UIOb
new Component[]{superLink, null},
};
superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Hyperlink"}, components, rowSize, columnSize);
superlinkPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Report_Hyperlink"}, components, rowSize, columnSize);
}
private void relayoutWithPlot(Plot plot) {

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

@ -61,7 +61,7 @@ public class ChartAxisLineStylePane extends BasicPane{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Graduation_Line")),null},
new Component[]{null,secondTickPosition}
} ;
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Style"},components,rowSize,columnSize);
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Style"},components,rowSize,columnSize);
this.setLayout(new BorderLayout());
this.add(panel,BorderLayout.CENTER);
}

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

@ -78,7 +78,7 @@ public class ChartBackgroundPane extends BasicPane{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha_Degree")), null},
new Component[]{null, transparent}
};
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Background"}, components,rowSize,columnSize);
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Background"}, components,rowSize,columnSize);
this.setLayout(new BorderLayout());
this.add(panel,BorderLayout.CENTER);
this.add(new JSeparator(), BorderLayout.SOUTH);

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

@ -30,7 +30,7 @@ public class ChartBeautyPane extends BasicBeanPane<Integer>{
Component[][] components = new Component[][]{
new Component[]{styleBox},
} ;
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"InterfaceStyle"},components,rowSize,columnSize);
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Style"},components,rowSize,columnSize);
this.setLayout(new BorderLayout());
this.add(panel,BorderLayout.CENTER);
}

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

@ -38,7 +38,7 @@ public class ChartBorderPane extends BasicPane{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Color")+":"),currentLineColorPane},
new Component[]{null,isRoundBorder}
} ;
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Border"},components,rowSize,columnSize);
JPanel panel = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Border"},components,rowSize,columnSize);
this.setLayout(new BorderLayout());
this.add(panel,BorderLayout.CENTER) ;
this.add(new JSeparator(), BorderLayout.SOUTH);

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

@ -116,7 +116,7 @@ public class ChartFillStylePane extends BasicBeanPane<AttrFillStyle>{
new Component[]{styleSelectBox},
new Component[]{customPane}
} ;
return TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ColorMatch"},components,rowSize,columnSize);
return TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Color_Match"},components,rowSize,columnSize);
}
@Override

8
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/analysisline/ChartAnalysisLinePane.java
Unescape View File

@ -68,15 +68,15 @@ public class ChartAnalysisLinePane extends BasicScrollPane<Chart>{
double f = TableLayout.FILL;
double[] row = {p};
double[] col = {f};
trendLine = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_TrendLine"}, new Component[][]{new Component[]{trendLinePane}}, row, col);
trendLine = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_TrendLine"}, new Component[][]{new Component[]{trendLinePane}}, row, col);
}
//最多有两条坐标轴是值类型的
if(plot.getAlertLinePaneTitle().length == 2){
String[] title = plot.getAlertLinePaneTitle();
firstAlertPane = this.createAlertLinePane(new String[]{title[0], "ChartF-Alert-Line"}, true);
secondAlertPane = this.createAlertLinePane(new String[]{title[1], "ChartF-Alert-Line"}, false);
firstAlertPane = this.createAlertLinePane(new String[]{title[0], "Fine-Design_Chart_Alert_Line"}, true);
secondAlertPane = this.createAlertLinePane(new String[]{title[1], "Fine-Design_Chart_Alert_Line"}, false);
}else if(plot.getyAxis() instanceof ValueAxis){
firstAlertPane = this.createAlertLinePane(new String[]{"ChartF-Alert-Line"}, true);
firstAlertPane = this.createAlertLinePane(new String[]{"Fine-Design_Chart_Alert_Line"}, true);
}
Component[][] component = null;;
if(trendLine != null){

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

@ -59,7 +59,7 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane {
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Utils_Top_To_Bottom") + ":"),verticalColorPane},
};
backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Chart_Interval_Back"}, components, rowSize, columnSize);
backgroundPane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Interval_Background"}, components, rowSize, columnSize);
}
//初始化网格线
@ -82,7 +82,7 @@ public class DefaultAxisAreaPane extends ChartAxisAreaPane {
new Component[]{container,null}
};
gridlinePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Grid_Line"}, components, rowSize, columnSize);
gridlinePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Grid_Line"}, components, rowSize, columnSize);
}

16
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartCategoryPane.java
Unescape View File

@ -61,7 +61,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
private JPanel getPaneWithOutLineStyle(){
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{
new Component[]{axisValuePane}}, new double[]{p}, new double[]{f});
double[] columnSize = {f};
double[] rowSize = { p, p, p, p, p, p, p, p, p, p};
@ -73,7 +73,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
new Component[]{new JSeparator()},
new Component[]{axisReversed},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},
@ -84,7 +84,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
private JPanel getPaneWithLineStyle(){
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{
new Component[]{axisValuePane}}, new double[]{p}, new double[]{f});
double[] columnSize = {f};
double[] rowSize = { p, p, p, p, p, p, p, p, p, p, p, p};
@ -98,7 +98,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
new Component[]{new JSeparator()},
new Component[]{axisReversed},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},
@ -217,7 +217,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
private JPanel getPaneWithOutAxisRevertAndLineStyle(){
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{
new Component[]{axisValuePane}}, new double[]{p}, new double[]{f});
double[] columnSize = {f};
double[] rowSize = { p, p, p, p, p, p, p, p};
@ -227,7 +227,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
new Component[]{new JSeparator()},
new Component[]{getAxisTitlePane()},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},
@ -239,7 +239,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
private JPanel getPaneWithOutAxisRevert(){
double f = TableLayout.FILL;
double p = TableLayout.PREFERRED;
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Axis", "Type"}, new Component[][]{
JPanel axisTypePane = TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Axis_Type"}, new Component[][]{
new Component[]{axisValuePane}}, new double[]{p}, new double[]{f});
double[] columnSize = {f};
double[] rowSize = { p, p, p, p, p, p, p, p, p, p};
@ -251,7 +251,7 @@ public class ChartCategoryPane extends ChartAxisUsePane<Axis>{
new Component[]{new JSeparator()},
new Component[]{axisLineStylePane},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},

16
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartValuePane.java
Unescape View File

@ -109,10 +109,10 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
new Component[]{new JSeparator()},
new Component[]{axisReversed},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{
new Component[]{unitCombox}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},
@ -135,10 +135,10 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
new Component[]{new JSeparator()},
new Component[]{axisReversed},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{
new Component[]{unitCombox}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},
@ -327,10 +327,10 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
new Component[]{axisLineStylePane},
new Component[]{zeroPane},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{
new Component[]{unitCombox}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},
@ -352,10 +352,10 @@ public class ChartValuePane extends ChartAxisUsePane<Axis>{
Component[][] components = new Component[][]{
new Component[]{getAxisTitlePane()},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"ChartF-Units"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Units"}, new Component[][]{
new Component[]{unitCombox}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Data_Type"}, new Component[][]{
new Component[]{TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_DataType"}, new Component[][]{
new Component[]{formatPane}}, new double[]{p}, new double[]{f})},
new Component[]{new JSeparator()},
new Component[]{axisLabelPane},

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

@ -54,11 +54,11 @@ public class Donut2DSeriesPane extends AbstractPlotSeriesPane{
Component[][] components = new Component[][]{
new Component[]{stylePane, null},
new Component[]{new JSeparator(), null},
new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"InnerRadis"},
new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Inner_Radius"},
new Component[][]{new Component[]{innerRadiusPercent}}, singleRow, singleCol)},
new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"FR-Chart-Gap_Series"},
new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Gap_Series"},
new Component[][]{new Component[]{seriesGap}}, singleRow, singleCol)},
new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"FR-Chart-Gap_Category"},
new Component[]{null, TableLayoutHelper.createTableLayoutPane4Chart(new String[]{"Fine-Design_Chart_Gap_Category"},
new Component[][]{new Component[]{categoryGap}}, singleRow, singleCol)},
};

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

@ -178,7 +178,7 @@ public class VanChartPlotLegendPane extends BasicPane {
initPositionListener();
JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components,row,col);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout"), panel);
return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout_Position"), panel);
}
private void initPositionListener(){

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

@ -121,7 +121,7 @@ public class CellStylePane extends AbstractCellAttrPane {
@Override
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style"));
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Style");
}
public void setSelectedByIds(int level, String... id) {

Write Preview
Loading…
Cancel
Save