From f8f07e570f9fe16666877f9163c6aa4a47e61af7 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Fri, 10 Aug 2018 21:53:16 +0800 Subject: [PATCH 1/4] on 0810 --- .../SeriesCondition/impl/ChartHyperRelateCellLinkPane.java | 4 ++-- .../SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java index 665d62252..ec3a867fa 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateCellLinkPane.java @@ -48,7 +48,7 @@ public class ChartHyperRelateCellLinkPane extends AbstractHyperLinkPane Date: Mon, 13 Aug 2018 19:47:55 +0800 Subject: [PATCH 2/4] d0813 --- .../com/fr/design/chart/series/PlotSeries/MapCustomPane.java | 4 ++-- .../design/chart/series/PlotSeries/MapDefiAreaNamePane.java | 2 +- .../design/chart/series/PlotSeries/MapGroupExtensionPane.java | 2 +- .../design/chart/series/PlotSeries/UIGroupExtensionPane.java | 2 +- .../chart/series/SeriesCondition/ConditionTrendLinePane.java | 4 ++-- .../chart/series/SeriesCondition/DataSeriesAttrPane.java | 2 +- .../chart/series/SeriesCondition/DataSeriesConditionPane.java | 2 +- .../chart/series/SeriesCondition/LabelAxisPositionPane.java | 2 +- .../chart/series/SeriesCondition/TrendLineControlPane.java | 2 +- .../fr/design/chart/series/SeriesCondition/TrendLinePane.java | 2 +- .../mainframe/chart/gui/style/series/BubbleSeriesPane.java | 4 ++-- .../van/chart/designer/style/axis/VanChartTimeAxisPane.java | 4 ++-- .../designer/style/background/AlertLineListControlPane.java | 2 +- .../main/java/com/fr/van/chart/line/VanChartLinePlotPane.java | 2 +- .../van/chart/range/component/GradualIntervalConfigPane.java | 2 +- .../van/chart/range/component/SectionIntervalConfigPane.java | 2 +- 16 files changed, 20 insertions(+), 20 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java index d2fac337a..f544f12f0 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapCustomPane.java @@ -91,7 +91,7 @@ refreshAreaNameBox(); tableDataNameBox.setPreferredSize(new Dimension(200, 20)); 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(); areaString.setPreferredSize(new Dimension(120, 20)); @@ -229,7 +229,7 @@ refreshAreaNameBox(); @Override 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"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java index d6e1f1bb0..dba412613 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapDefiAreaNamePane.java @@ -158,7 +158,7 @@ public class MapDefiAreaNamePane extends BasicBeanPane implements Abstrc @Override 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"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java index 2891cdb61..df8249273 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapGroupExtensionPane.java +++ b/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) { - 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() { public void actionPerformed(ActionEvent e) { final MapDefiAreaNamePane namedPane = new MapDefiAreaNamePane(); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java index 3ca7e5e59..2f69013ce 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/UIGroupExtensionPane.java @@ -431,7 +431,7 @@ public class UIGroupExtensionPane extends BasicPane { }; isPressOnDelete = true; 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); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java index 5350ffd4b..1657b32ca 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ConditionTrendLinePane.java @@ -63,7 +63,7 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); 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(); typePane.add(buttonPane); @@ -97,7 +97,7 @@ public class ConditionTrendLinePane extends BasicBeanPane { private JPanel initExtendsPane() { 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(forwardLabel = new UITextField("0", 5)); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java index 9167d0b94..02f1ab75a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesAttrPane.java @@ -43,7 +43,7 @@ public class DataSeriesAttrPane extends JListControlPane { @Override 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) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java index 92cd574ea..dd19bdfab 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataSeriesConditionPane.java @@ -166,7 +166,7 @@ public class DataSeriesConditionPane extends ConditionAttributesPane(nameArray, valueArray); 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 diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java index ce6273251..757e84955 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/axis/VanChartTimeAxisPane.java +++ b/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() { // 主要刻度单位 - 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.setPreferredSize(new Dimension(20, 20)); mainType = new UIComboBox(TYPES); @@ -245,7 +245,7 @@ public class VanChartTimeAxisPane extends VanChartBaseAxisPane { 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.setPreferredSize(new Dimension(20, 20)); secondType = new UIComboBox(TYPES); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java index 428d20a13..7d5528050 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/AlertLineListControlPane.java +++ b/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() { - 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() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java index e70f8178d..5de757af8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/line/VanChartLinePlotPane.java @@ -27,7 +27,7 @@ public class VanChartLinePlotPane extends AbstractVanChartTypePane { protected String[] getTypeTipName() { return new String[]{ 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") }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java index f90139948..7a34ac565 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/GradualIntervalConfigPane.java +++ b/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(){ return new Component[][]{ 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[]{null, legendGradientBar}, }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java b/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java index 1d846aa8e..5aa474b45 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/range/component/SectionIntervalConfigPane.java +++ b/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(){ return new Component[][]{ 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("Fine-Design_Chart_Range_Num")),getDesignTypeButtonGroup()}, From 3511eae0c878c26ff6620ff1596140fcbdb143e3 Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Tue, 14 Aug 2018 10:42:19 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=84=E8=8C=83=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E5=8C=96=E6=96=87=E4=BB=B6=E5=8F=8A=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=AE=9A=E4=B9=89=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer-base/src/main/java/com/fr/start/server/ServerTray.java | 2 +- .../com/fr/design/actions/columnrow/DSColumnAdvancedAction.java | 2 +- .../main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java | 2 +- .../src/main/java/com/fr/design/dscolumn/DSColumnPane.java | 2 +- .../main/java/com/fr/design/dscolumn/ResultSetGroupPane.java | 2 +- .../src/main/java/com/fr/design/headerfooter/HFContainer.java | 2 +- .../java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/designer-base/src/main/java/com/fr/start/server/ServerTray.java b/designer-base/src/main/java/com/fr/start/server/ServerTray.java index 48dff7dd1..ce2da0407 100644 --- a/designer-base/src/main/java/com/fr/start/server/ServerTray.java +++ b/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")); 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() { diff --git a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java b/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java index 6a09e07aa..c378ea300 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/columnrow/DSColumnAdvancedAction.java +++ b/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) { 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.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/expand/cellAttr.gif")); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java index 2f791dd3f..38de79701 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java +++ b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnAdvancedPane.java @@ -120,7 +120,7 @@ public class DSColumnAdvancedPane extends BasicPane { @Override 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) { diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java index 63d6c216b..cae7a5f51 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/DSColumnPane.java +++ b/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); 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)); } diff --git a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java b/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java index 0a685c9c0..2097dfcfc 100644 --- a/designer-realize/src/main/java/com/fr/design/dscolumn/ResultSetGroupPane.java +++ b/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 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); diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java index 84efb7d2d..577a0710b 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFContainer.java +++ b/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( 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("Delete"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Delete"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); diff --git a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java index 9bb72fa16..2bf49b6e3 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/cellquick/CellDSColumnEditor.java +++ b/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.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 5)); 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.addActionListener(formulaButtonActionListener); From 5a8669993d40efab2c2b0bb3e9fd9ef0b19285b0 Mon Sep 17 00:00:00 2001 From: vito Date: Tue, 14 Aug 2018 11:40:36 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-9518=20=E5=90=AF=E5=8A=A8=E5=8A=A8?= =?UTF-8?q?=E7=94=BB=E7=95=8C=E9=9D=A2=E5=81=B6=E5=B0=94=E5=AD=97=E4=BD=93?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/start/fx/SplashFxWindow.java | 20 +++++++------------ 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java b/designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java index e86384669..1b3e986af 100644 --- a/designer-realize/src/main/java/com/fr/start/fx/SplashFxWindow.java +++ b/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 { - private static float JBUI_INIT_SCALE = JBUI.scale(1f); - private static final String ARIAL_FONT_NAME = "Arial"; private static final String PF_FONT_NAME = "PingFang"; private static final String YAHEI_FONT_NAME = "Microsoft YaHei"; @@ -53,10 +51,6 @@ public class SplashFxWindow extends Application { private FastGifImage image; private List listeners = new ArrayList(); - 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); Font font; if (OperatingSystem.isWindows()) { - font = new Font(YAHEI_FONT_NAME, uiScale(FONT)); + font = new Font(YAHEI_FONT_NAME, FONT); } else if (OperatingSystem.isMacOS()) { - font = new Font(PF_FONT_NAME, uiScale(FONT)); + font = new Font(PF_FONT_NAME, FONT); } else { - font = new Font(ARIAL_FONT_NAME, uiScale(FONT)); + font = new Font(ARIAL_FONT_NAME, FONT); } moduleInfo = new Text(); moduleInfo.setFont(font); moduleInfo.setFill(Color.WHITE); - AnchorPane.setLeftAnchor(moduleInfo, (double) uiScale(MODULE_INFO_LEFT_MARGIN)); - AnchorPane.setBottomAnchor(moduleInfo, (double) uiScale(MODULE_INFO_BOTTOM_MARGIN)); + AnchorPane.setLeftAnchor(moduleInfo,(double) MODULE_INFO_LEFT_MARGIN); + AnchorPane.setBottomAnchor(moduleInfo,(double) MODULE_INFO_BOTTOM_MARGIN); thanks = new Text(); thanks.setFont(font); thanks.setFill(Color.valueOf(THINKS_COLOR)); - AnchorPane.setRightAnchor(thanks, (double) uiScale(THINKS_BOTTOM_RIGHT)); - AnchorPane.setBottomAnchor(thanks, (double) uiScale(THINKS_BOTTOM_MARGIN)); + AnchorPane.setRightAnchor(thanks, (double) THINKS_BOTTOM_RIGHT); + AnchorPane.setBottomAnchor(thanks, (double) THINKS_BOTTOM_MARGIN); root.getChildren().add(gif); root.getChildren().add(moduleInfo);