Browse Source

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

final/10.0
Harrison 6 years ago
parent
commit
bf85380f96
  1. 2
      designer-base/src/main/java/com/fr/start/server/ServerTray.java
  2. 4
      designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.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/PlotSeries/UIGroupExtensionPane.java
  6. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java
  7. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java
  8. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java
  9. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelAxisPositionPane.java
  10. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TrendLineControlPane.java
  11. 2
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/TrendLinePane.java
  12. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java
  13. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java
  14. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/BubbleSeriesPane.java
  15. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java
  16. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java
  17. 2
      designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java
  18. 2
      designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java
  19. 2
      designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java
  20. 2
      designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java
  21. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java
  22. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java
  23. 2
      designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java
  24. 2
      designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java
  25. 2
      designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  26. 20
      designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java

2
designer-base/src/main/java/com/fr/start/server/ServerTray.java

@ -52,7 +52,7 @@ public class ServerTray {
}); });
startMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Start")); startMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Start"));
stopMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Stop")); stopMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Server_Embedded_Server_Stop"));
MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Exit")); MenuItem exitMenu = new MenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Exit"));
//创建打开监听器 //创建打开监听器
ActionListener startListener = new ActionListener() { ActionListener startListener = new ActionListener() {

4
designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java

@ -91,7 +91,7 @@ refreshAreaNameBox();
tableDataNameBox.setPreferredSize(new Dimension(200, 20)); tableDataNameBox.setPreferredSize(new Dimension(200, 20));
northPane.add(tableDataNameBox); northPane.add(tableDataNameBox);
northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Field"}) + ":")); northPane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Region_Field") + ":"));
areaString = new FilterComboBox<String>(); areaString = new FilterComboBox<String>();
areaString.setPreferredSize(new Dimension(120, 20)); areaString.setPreferredSize(new Dimension(120, 20));
@ -229,7 +229,7 @@ refreshAreaNameBox();
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Datasource-User_Defined", "Chart-Map"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Map");
} }
/** /**

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

@ -158,7 +158,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane<String> implements Abstrc
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "Area_Name"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Area_Name");
} }
/** /**

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

@ -300,7 +300,7 @@ public class MapGroupExtensionPane extends BasicPane implements UIObserver {
} }
private JMenuItem createLayerItem(final String oldName) { private JMenuItem createLayerItem(final String oldName) {
JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "Corresponding_Fields"})); JMenuItem corrItem = new JMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Map_Corresponding_Fields"));
corrItem.addActionListener(new ActionListener() { corrItem.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane(); final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane();

2
designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java

@ -431,7 +431,7 @@ public class UIGroupExtensionPane extends BasicPane {
}; };
isPressOnDelete = true; isPressOnDelete = true;
bp.setLayout(new BorderLayout()); bp.setLayout(new BorderLayout());
bp.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Delete", "Chart-Map"}) + "?", SwingConstants.CENTER)); bp.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Delete_Map") + "?", SwingConstants.CENTER));
clearLastListSelection(list); clearLastListSelection(list);

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java

@ -63,7 +63,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane();
pane.add(typePane); pane.add(typePane);
typePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Type"}), null)); typePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Type"), null));
JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); JPanel buttonPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane();
typePane.add(buttonPane); typePane.add(buttonPane);
@ -97,7 +97,7 @@ public class ConditionTrendLinePane extends BasicBeanPane<ConditionTrendLine> {
private JPanel initExtendsPane() { private JPanel initExtendsPane() {
JPanel extendsPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // 前推倒推设置 JPanel extendsPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); // 前推倒推设置
extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Forecast"}), null)); extendsPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Forecast"), null));
extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":")); extendsPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine_Forward") + ":"));
extendsPane.add(forwardLabel = new UITextField("0", 5)); extendsPane.add(forwardLabel = new UITextField("0", 5));

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

@ -43,7 +43,7 @@ public class DataSeriesAttrPane extends JListControlPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Display"}); return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display");
} }
public void populate(Plot plot) { public void populate(Plot plot) {

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

@ -166,7 +166,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane<ConditionAt
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Condition", "Display"}); return com.fr.design.i18n.Toolkit.i18nText("Chart-Condition_Display");
} }
/** /**

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

@ -29,7 +29,7 @@ public class LabelAxisPositionPane extends ConditionAttrSingleConditionPane<Data
public LabelAxisPositionPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) { public LabelAxisPositionPane(ConditionAttributesPane conditionAttributesPane, boolean isRemove) {
super(conditionAttributesPane, isRemove); super(conditionAttributesPane, isRemove);
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Axis", "Selection"})); nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Axis_Selection"));
if (isRemove) { if (isRemove) {
this.add(nameLabel); this.add(nameLabel);
} }

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

@ -26,7 +26,7 @@ public class TrendLineControlPane extends JListControlPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Chart_TrendLine"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Trendline");
} }
public void populate(AttrTrendLine trendLineList) { public void populate(AttrTrendLine trendLineList) {

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

@ -34,7 +34,7 @@ public class TrendLinePane extends ConditionAttrSingleConditionPane<DataSeriesCo
super(conditionAttributesPane, isRemove); super(conditionAttributesPane, isRemove);
nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine")); nameLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_TrendLine"));
editTrendLineButton = new UIButton(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Chart_TrendLine"})); editTrendLineButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Edit_Trendline"));
editTrendLineButton.addActionListener(new ActionListener() { editTrendLineButton.addActionListener(new ActionListener() {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
final TrendLineControlPane controlPane = new TrendLineControlPane(); final TrendLineControlPane controlPane = new TrendLineControlPane();

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java

@ -48,7 +48,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
this.add(centerPane, BorderLayout.CENTER); this.add(centerPane, BorderLayout.CENTER);
centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "FR-Designer_Cell"}))); centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell")));
colRowPane = new ColumnRowVerticalPane(); colRowPane = new ColumnRowVerticalPane();
centerPane.add(colRowPane, BorderLayout.NORTH); centerPane.add(colRowPane, BorderLayout.NORTH);
@ -113,7 +113,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane<ChartHyp
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Related", "Cell"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Cell");
} }
public static class ChartNoRename extends ChartHyperRelateCellLinkPane { public static class ChartNoRename extends ChartHyperRelateCellLinkPane {

4
designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java

@ -64,7 +64,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR); Border boder = new LineBorder(UIConstants.TITLED_BORDER_COLOR);
Font font = null; Font font = null;
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)); TitledBorder border = new TitledBorder(boder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float"), 4, 2, font, new Color(1, 159, 222));
// 圆角不行 // 圆角不行
centerPane.setBorder(border); centerPane.setBorder(border);
@ -144,7 +144,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane<ChartHy
@Override @Override
public String title4PopupWindow() { public String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Float_Related"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyper_Related_Float");
} }
public static class ChartNoRename extends ChartHyperRelateFloatLinkPane { public static class ChartNoRename extends ChartHyperRelateFloatLinkPane {

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

@ -51,12 +51,12 @@ public class BubbleSeriesPane extends AbstractPlotSeriesPane{
} }
protected void initCom(){ protected void initCom(){
String[] nameArray = {com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Bubble", "Chart_Area"}), String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Area"),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Width")}; com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bubble_Width")};
Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH}; Integer[] valueArray = {BubblePlot.BUBBLE_AREA, BubblePlot.BUBBLE_WIDTH};
bubbleMean = new UIButtonGroup<Integer>(nameArray, valueArray); bubbleMean = new UIButtonGroup<Integer>(nameArray, valueArray);
zoomTime = new UITextField(); zoomTime = new UITextField();
isMinus = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Display", "Chart_Negative_Bubble"})); isMinus = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Display_Negative"));
} }
@Override @Override

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

@ -229,7 +229,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
private void initMain() { private void initMain() {
// 主要刻度单位 // 主要刻度单位
mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_MainType"})); mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Main_Type"));
mainUnitField = new UITextField(); mainUnitField = new UITextField();
mainUnitField.setPreferredSize(new Dimension(20, 20)); mainUnitField.setPreferredSize(new Dimension(20, 20));
mainType = new UIComboBox(TYPES); mainType = new UIComboBox(TYPES);
@ -245,7 +245,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane {
private void initSecond() { private void initSecond() {
// 次要刻度单位 // 次要刻度单位
secondTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Custom", "Plugin-ChartF_SecType"})); secondTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Custom_Second_Type"));
secondUnitField = new UITextField(); secondUnitField = new UITextField();
secondUnitField.setPreferredSize(new Dimension(20, 20)); secondUnitField.setPreferredSize(new Dimension(20, 20));
secondType = new UIComboBox(TYPES); secondType = new UIComboBox(TYPES);

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

@ -35,7 +35,7 @@ public class AlertLineListControlPane extends VanChartUIListControlPane {
} }
protected String getAddItemText() { protected String getAddItemText() {
return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Plugin-Chart_Add_Line","Plugin-ChartF_AlertLine"}); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Add_Alert_Line");
} }
protected ShortCut4JControlPane[] createShortcuts() { protected ShortCut4JControlPane[] createShortcuts() {

2
designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java

@ -27,7 +27,7 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane {
protected String[] getTypeTipName() { protected String[] getTypeTipName() {
return new String[]{ return new String[]{
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Line"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Type_Line"),
com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Type_Stacked","FR-Chart-Type_Line"}), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Stacked_Line"),
com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom") com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Mode_Custom")
}; };
} }

2
designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java

@ -73,7 +73,7 @@ public class GradualIntervalConfigPane extends JPanel{
protected Component[][] getPaneComponents(){ protected Component[][] getPaneComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{minMaxValuePane, null}, new Component[]{minMaxValuePane, null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), colorSelectBox}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), colorSelectBox},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), numberDragPane},
new Component[]{null, legendGradientBar}, new Component[]{null, legendGradientBar},
}; };

2
designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java

@ -28,7 +28,7 @@ public class SectionIntervalConfigPane extends MapColorPickerPaneWithFormula {
protected Component[][] createComponents(){ protected Component[][] createComponents(){
return new Component[][]{ return new Component[][]{
new Component[]{null,null}, new Component[]{null,null},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"FR-Chart-Color_Subject", "FR-Chart-Color_Color"})), getFillStyleCombox()}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Subject_Color")), getFillStyleCombox()},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), getRegionNumPane()}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Value_Divided_stage")), getRegionNumPane()},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")),getDesignTypeButtonGroup()}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Range_Num")),getDesignTypeButtonGroup()},

2
designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java

@ -14,7 +14,7 @@ public class DSColumnAdvancedAction extends AbstractCellElementAction {
public DSColumnAdvancedAction(ElementCasePane t) { public DSColumnAdvancedAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Advanced")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"));
this.setMnemonic('A'); this.setMnemonic('A');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif"));
} }

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java

@ -120,7 +120,7 @@ public class DSColumnAdvancedPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("Advanced"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced");
} }
public void populate(TemplateCellElement cellElement) { public void populate(TemplateCellElement cellElement) {

2
designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java

@ -104,7 +104,7 @@ public class DSColumnPane extends BasicPane {
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Filter"), conditionPane);
advancedPane = new DSColumnAdvancedPane(setting); advancedPane = new DSColumnAdvancedPane(setting);
tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Advanced"), advancedPane); tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), advancedPane);
this.setPreferredSize(new Dimension(610, 400)); this.setPreferredSize(new Dimension(610, 400));
} }

2
designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java

@ -31,7 +31,7 @@ public abstract class ResultSetGroupPane extends JPanel {
protected UIComboBox groupComboBox; protected UIComboBox groupComboBox;
protected ResultSetGroupPane(){ protected ResultSetGroupPane(){
groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Advanced")}); groupComboBox = new UIComboBox(new String[] {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Continuum"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced")});
} }
abstract void populate(TemplateCellElement cellElement); abstract void populate(TemplateCellElement cellElement);

2
designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java

@ -286,7 +286,7 @@ public class HFContainer extends JPanel implements Scrollable {
int returnVal = JOptionPane.showConfirmDialog( int returnVal = JOptionPane.showConfirmDialog(
SwingUtilities.getWindowAncestor(HFContainer.this), SwingUtilities.getWindowAncestor(HFContainer.this),
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Are_You_Sure_To_Delete_It") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_HF_Are_You_Sure_To_Delete_It") + "?",
com.fr.design.i18n.Toolkit.i18nText("Delete"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_CANCEL_OPTION,
JOptionPane.QUESTION_MESSAGE); JOptionPane.QUESTION_MESSAGE);

2
designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java

@ -1072,7 +1072,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
textFieldPane.add(formulaTextField, BorderLayout.CENTER); textFieldPane.add(formulaTextField, BorderLayout.CENTER);
textFieldPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); textFieldPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5));
UIButton formulaButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/m_insert/formula.png")); UIButton formulaButton = new UIButton(IOUtils.readIcon("/com/fr/design/images/m_insert/formula.png"));
formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Formula") + "..."); formulaButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Formula") + "...");
formulaButton.setPreferredSize(new Dimension(20, formulaTextField.getPreferredSize().height)); formulaButton.setPreferredSize(new Dimension(20, formulaTextField.getPreferredSize().height));
formulaButton.addActionListener(formulaButtonActionListener); formulaButton.addActionListener(formulaButtonActionListener);

20
designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java

@ -30,8 +30,6 @@ import java.util.concurrent.CountDownLatch;
*/ */
public class SplashFxWindow extends Application { public class SplashFxWindow extends Application {
private static float JBUI_INIT_SCALE = JBUI.scale(1f);
private static final String ARIAL_FONT_NAME = "Arial"; private static final String ARIAL_FONT_NAME = "Arial";
private static final String PF_FONT_NAME = "PingFang"; private static final String PF_FONT_NAME = "PingFang";
private static final String YAHEI_FONT_NAME = "Microsoft YaHei"; private static final String YAHEI_FONT_NAME = "Microsoft YaHei";
@ -53,10 +51,6 @@ public class SplashFxWindow extends Application {
private FastGifImage image; private FastGifImage image;
private List<SplashFxActionListener> listeners = new ArrayList<SplashFxActionListener>(); private List<SplashFxActionListener> listeners = new ArrayList<SplashFxActionListener>();
private static int uiScale(int i) {
return (int) (i * JBUI_INIT_SCALE);
}
/** /**
* 获取当前运行实例黑科技 * 获取当前运行实例黑科技
* *
@ -94,23 +88,23 @@ public class SplashFxWindow extends Application {
AnchorPane.setRightAnchor(gif, 0d); AnchorPane.setRightAnchor(gif, 0d);
Font font; Font font;
if (OperatingSystem.isWindows()) { if (OperatingSystem.isWindows()) {
font = new Font(YAHEI_FONT_NAME, uiScale(FONT)); font = new Font(YAHEI_FONT_NAME, FONT);
} else if (OperatingSystem.isMacOS()) { } else if (OperatingSystem.isMacOS()) {
font = new Font(PF_FONT_NAME, uiScale(FONT)); font = new Font(PF_FONT_NAME, FONT);
} else { } else {
font = new Font(ARIAL_FONT_NAME, uiScale(FONT)); font = new Font(ARIAL_FONT_NAME, FONT);
} }
moduleInfo = new Text(); moduleInfo = new Text();
moduleInfo.setFont(font); moduleInfo.setFont(font);
moduleInfo.setFill(Color.WHITE); moduleInfo.setFill(Color.WHITE);
AnchorPane.setLeftAnchor(moduleInfo, (double) uiScale(MODULE_INFO_LEFT_MARGIN)); AnchorPane.setLeftAnchor(moduleInfo,(double) MODULE_INFO_LEFT_MARGIN);
AnchorPane.setBottomAnchor(moduleInfo, (double) uiScale(MODULE_INFO_BOTTOM_MARGIN)); AnchorPane.setBottomAnchor(moduleInfo,(double) MODULE_INFO_BOTTOM_MARGIN);
thanks = new Text(); thanks = new Text();
thanks.setFont(font); thanks.setFont(font);
thanks.setFill(Color.valueOf(THINKS_COLOR)); thanks.setFill(Color.valueOf(THINKS_COLOR));
AnchorPane.setRightAnchor(thanks, (double) uiScale(THINKS_BOTTOM_RIGHT)); AnchorPane.setRightAnchor(thanks, (double) THINKS_BOTTOM_RIGHT);
AnchorPane.setBottomAnchor(thanks, (double) uiScale(THINKS_BOTTOM_MARGIN)); AnchorPane.setBottomAnchor(thanks, (double) THINKS_BOTTOM_MARGIN);
root.getChildren().add(gif); root.getChildren().add(gif);
root.getChildren().add(moduleInfo); root.getChildren().add(moduleInfo);

Loading…
Cancel
Save