Browse Source

Merge remote-tracking branch 'origin/release/10.0' into release/10.0

final/10.0
Jinbokai 6 years ago
parent
commit
af8b7f8a11
  1. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java
  2. 8
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java
  3. 6
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java
  4. 2
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java

6
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java

@ -42,14 +42,14 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
private static final int TICK_HEIGHT = 20;
private static final int COM_GAP =5;
private static final String YEAR = com.fr.design.i18n.Toolkit.i18nText("Year");
private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Month");
private static final String MONTH =com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month");
private static final String DAY =com.fr.design.i18n.Toolkit.i18nText("Sun");
private static final String HOUR = com.fr.design.i18n.Toolkit.i18nText("Sche-Hour");
private static final String MINUTE = com.fr.design.i18n.Toolkit.i18nText("Sche-Minute");
private static final String SECOND = com.fr.design.i18n.Toolkit.i18nText("Sche-Second");
private static String[] TYPES = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Second")
};
@ -67,7 +67,7 @@ public class TimeSwitchPane extends JPanel implements UIObserver {
private static Map<Integer, String> INTS = new HashMap<Integer, String>();
static {
INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Month"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"));
INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun"));
INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"));
INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"));

8
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java

@ -33,11 +33,9 @@ public class ChartAxisLineStylePane extends BasicPane{
axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS);
axisLineColor = new ColorSelectBox(100);
<<<<<<< HEAD
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")};
=======
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")};
>>>>>>> 4c1c2515a1aee68b5a9e8d9b51be5a4a9d3fb1d6
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_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"),

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

@ -48,7 +48,7 @@ import java.util.regex.Pattern;
public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private static String[] TYPES = new String[]{
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Year"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), com.fr.design.i18n.Toolkit.i18nText("Sun"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"),
com.fr.design.i18n.Toolkit.i18nText("Sche-Second")
};
@ -56,7 +56,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private static Map<String, Integer> VALUES = new HashMap<String, Integer>();
static {
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Year"), ChartConstants.YEAR_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Month"), ChartConstants.MONTH_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"), ChartConstants.MONTH_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sun"), ChartConstants.DAY_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"), ChartConstants.HOUR_TYPE);
VALUES.put(com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"), ChartConstants.MINUTE_TYPE);
@ -66,7 +66,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane<CategoryAxis>{
private static Map<Integer, String> INTS = new HashMap<Integer, String>();
static {
INTS.put(ChartConstants.YEAR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Year"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Month"));
INTS.put(ChartConstants.MONTH_TYPE, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Month"));
INTS.put(ChartConstants.DAY_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sun"));
INTS.put(ChartConstants.HOUR_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Hour"));
INTS.put(ChartConstants.MINUTE_TYPE, com.fr.design.i18n.Toolkit.i18nText("Sche-Minute"));

2
designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java

@ -41,6 +41,6 @@ public class ChartSecondValueNoFormulaPane extends ChartValueNoFormulaPane{
* @return 第二值轴
*/
public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_SecondValueAxis");
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Second_Value_Axis");
}
}
Loading…
Cancel
Save