From e29537648a683c8802e1aa1b332a324ac9c5f3b8 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Mon, 6 Aug 2018 11:17:01 +0800 Subject: [PATCH 01/24] occur a bug.. --- .../java/com/fr/design/actions/help/AboutDialog.java | 2 +- .../java/com/fr/design/actions/help/FeedBackPane.java | 2 +- .../data/datapane/connect/DatabaseConnectionPane.java | 2 +- .../java/com/fr/design/dialog/InformationWarnPane.java | 2 +- .../src/main/java/com/fr/design/dialog/UIDialog.java | 2 +- .../java/com/fr/design/gui/date/UICalendarPanel.java | 2 +- .../com/fr/design/gui/frpane/JTreeAutoBuildPane.java | 6 +++--- .../fr/design/gui/icombobox/DictionaryConstants.java | 4 ++-- .../java/com/fr/design/gui/icombobox/LineComboBox.java | 5 +---- .../java/com/fr/design/gui/iscrollbar/UISBChooser.java | 2 +- .../java/com/fr/design/layout/TableLayoutTest.java | 2 +- .../mainframe/widget/editors/WidgetValueEditor.java | 2 +- .../mainframe/widget/wrappers/BackgroundWrapper.java | 2 +- .../src/main/java/com/fr/design/menu/KeySetUtils.java | 8 ++------ .../src/main/java/com/fr/design/style/AlphaPane.java | 2 +- .../com/fr/design/style/color/ColorSelectDialog.java | 2 +- .../com/fr/design/widget/component/DateValuePane.java | 6 +++--- .../src/main/java/com/fr/design/chart/ChartDialog.java | 4 ++-- .../main/java/com/fr/design/chart/ChartTypePane.java | 2 +- .../fr/design/chart/axis/CustomChartStyleAxisPane.java | 2 +- .../java/com/fr/design/chart/comp/BorderAttriPane.java | 2 +- .../chart/gui/active/action/SetChartStyleAciton.java | 2 +- .../com/fr/design/chart/report/MapReportEditor.java | 2 +- .../com/fr/design/chart/report/MapReportRenderer.java | 2 +- .../series/SeriesCondition/ConditionTrendLinePane.java | 2 +- .../series/SeriesCondition/LabelLineStylePane.java | 4 ++-- .../series/SeriesCondition/dlp/Bar2DDataLabelPane.java | 2 +- .../SeriesCondition/dlp/BubbleDataLabelPane.java | 2 +- .../series/SeriesCondition/dlp/DataLabelPane.java | 2 +- .../series/SeriesCondition/dlp/PieDataLabelPane.java | 2 +- .../series/SeriesCondition/dlp/RangeDataLabelPane.java | 2 +- .../impl/ChartHyperRelateFloatLinkPane.java | 6 +++--- .../java/com/fr/design/gui/xcombox/MarkerComboBox.java | 2 +- .../design/mainframe/chart/gui/ChangeConfigPane.java | 2 +- .../chart/gui/style/ChartAxisLineStylePane.java | 4 ++-- .../mainframe/chart/gui/style/ChartBeautyPane.java | 2 +- .../mainframe/chart/gui/style/ChartBorderPane.java | 2 +- .../mainframe/chart/gui/style/ChartTextAttrPane.java | 2 +- .../mainframe/chart/gui/style/DateAxisValuePane.java | 6 +++--- .../chart/gui/style/series/Area3DSeriesPane.java | 2 +- .../gui/style/series/CustomDefaultSeriesPane.java | 4 ++-- .../style/series/CustomTypeConditionSeriesPane.java | 4 ++-- .../chart/gui/style/series/LineSeriesPane.java | 4 ++-- .../chart/gui/style/series/Pie2DSeriesPane.java | 2 +- .../chart/gui/style/series/RadarSeriesPane.java | 2 +- .../java/com/fr/extended/chart/ExtendedOtherPane.java | 2 +- .../custom/other/VanChartCustomInteractivePane.java | 2 +- .../chart/custom/style/VanChartCustomTooltipPane.java | 2 +- .../component/VanChartAreaSeriesFillColorPane.java | 2 +- .../chart/designer/component/VanChartBeautyPane.java | 2 +- .../designer/component/VanChartUIListControlPane.java | 2 +- .../component/background/VanChartGradientPane.java | 4 ++-- .../chart/designer/other/VanChartInteractivePane.java | 2 +- .../condition/item/VanChartDataSheetContentPane.java | 4 ++-- .../VanChartCustomIntervalBackgroundPane.java | 2 +- .../VanChartGaugeCateOrPercentLabelDetailPane.java | 4 ++-- .../style/label/VanChartPlotLabelDetailPane.java | 2 +- .../style/tooltip/VanChartPlotTooltipPane.java | 2 +- .../designer/style/tooltip/VanChartTooltipPane.java | 2 +- .../drillmap/designer/data/comp/DrillMapLayerPane.java | 2 +- .../other/VanChartDrillMapInteractivePane.java | 2 +- .../designer/style/series/VanChartGanttSeriesPane.java | 2 +- .../fr/van/chart/gauge/VanChartGaugeSeriesPane.java | 2 +- .../map/designer/other/VanChartMapInteractivePane.java | 2 +- .../designer/style/tooltip/VanChartMapTooltipPane.java | 2 +- .../com/fr/design/gui/xpane/JTreeAutoBuildPane.java | 6 +++--- .../widget/editors/BorderLayoutDirectionEditor.java | 2 +- .../ui/designer/component/FormWidgetValuePane.java | 2 +- .../src/main/java/com/fr/design/expand/ParentPane.java | 10 +++++----- .../mainframe/ElementCasePaneAuthorityEditPane.java | 2 +- .../main/java/com/fr/design/report/PageSetupPane.java | 2 +- .../main/java/com/fr/quickeditor/CellQuickEditor.java | 2 +- 72 files changed, 97 insertions(+), 104 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java index 0981ea680..f5d88bd24 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java @@ -42,7 +42,7 @@ public class AboutDialog extends JDialog implements ActionListener { JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane(); this.setContentPane(defaultPane); - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); okButton.addActionListener(this); tabbedPane = new UITabbedPane(); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java index 301789976..fdac0617b 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java @@ -68,7 +68,7 @@ public class FeedBackPane extends BasicPane { private static final String ALLOWED_INTEGER_TYPE = "0123456789"; private SwingWorker worker; private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true); - private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); private int ifHasBeenWriten = 0; private UITextArea detailField; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index cf0e93d2a..346bcdec3 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -48,7 +48,7 @@ public abstract class DatabaseConnectionPane" + com.fr.design.i18n.Toolkit.i18nText("OK") + "") { + okButton = new UIButton("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK") + "") { @Override public Dimension getPreferredSize() { // TODO Auto-generated method stub diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index dad7a8731..7b582441a 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java @@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog { } private void addOkButton(JPanel buttonsPane) { - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); okButton.setName(OK_BUTTON); okButton.setMnemonic('O'); buttonsPane.add(okButton); diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index 00d31d3dd..7b4498f2c 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel { gap.setPreferredSize(new Dimension(26,1)); sPane.add(gap); - UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")) { + UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")) { public Dimension getPreferredSize() { return new Dimension(32,18); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 6182e36ec..df30ad625 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); Component[][] coms = { @@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java index df5430ee3..caa246289 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java @@ -17,7 +17,7 @@ public class DictionaryConstants { "^\\d{6}$" }; public final static String[] regexpsDisplays = new String[] { - com.fr.design.i18n.Toolkit.i18nText("None"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), com.fr.design.i18n.Toolkit.i18nText("Required"), com.fr.design.i18n.Toolkit.i18nText("Length"), com.fr.design.i18n.Toolkit.i18nText("Float"), @@ -55,7 +55,7 @@ public class DictionaryConstants { }; public static final String[] symbolDisplays = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("None"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"), com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes") }; diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java index 4b04e63d4..115b62d1e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java @@ -10,7 +10,6 @@ import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Graphics2D; import java.awt.geom.GeneralPath; -import java.awt.geom.Line2D; import java.awt.geom.Point2D; import javax.swing.DefaultComboBoxModel; @@ -20,8 +19,6 @@ import javax.swing.JList; import com.fr.base.FRContext; import com.fr.base.GraphHelper; import com.fr.base.ScreenResolution; -import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.gui.icombobox.UIComboBoxRenderer; import com.fr.general.FRFont; import com.fr.stable.Constants; @@ -91,7 +88,7 @@ public class LineComboBox extends UIComboBox { FontMetrics fm = GraphHelper.getFontMetrics(rfont); if (style == Constants.LINE_NONE) { //draw "none" string - GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); + GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); } else { GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style); } diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java index a6ba74283..f4edc3685 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java +++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java @@ -106,7 +106,7 @@ public class UISBChooser extends JDialog { JButton b = new JButton("Cancel"); b.addActionListener(new CancelAction()); p3.add(b); - b = new JButton("OK"); + b = new JButton("Fine-Design_Chart_OK"); getRootPane().setDefaultButton(b); b.addActionListener(new OKAction()); p3.add(b); diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java b/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java index 7fa703b8a..8905fee05 100644 --- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java +++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java @@ -57,7 +57,7 @@ public class TableLayoutTest extends JFrame UITextField textfieldState = new UITextField(2); UITextField textfieldZip = new UITextField(5); - UIButton buttonOk = new UIButton("OK"); + UIButton buttonOk = new UIButton("Fine-Design_Chart_OK"); UIButton buttonCancel = new UIButton("Cancel"); JPanel panelButton = new JPanel(); panelButton.add(buttonOk); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java index f7ba64bfc..39aed2e85 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java @@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java index 815495bd2..0303bffc8 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java @@ -35,7 +35,7 @@ public class BackgroundWrapper implements Encoder, Decoder { } else if (v instanceof GradientBackground) { return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); } else { - return com.fr.design.i18n.Toolkit.i18nText("None"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"); } } diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 0a7389537..a70f14683 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -4,13 +4,9 @@ package com.fr.design.menu; -import com.fr.general.ComparatorUtils; -import com.fr.general.GeneralContext; - import javax.swing.*; import java.awt.event.KeyEvent; -import java.util.Locale; import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER; @@ -883,7 +879,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"); } @Override @@ -994,7 +990,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert-Float"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java index 143a937f6..8829fb847 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java @@ -50,7 +50,7 @@ public class AlphaPane extends JPanel { alphaPane.setBorder(BorderFactory.createEmptyBorder()); this.add(alphaPane, BorderLayout.CENTER); - alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha") + ":")); + alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha") + ":")); alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE)); alphaSlider.setPreferredSize(new Dimension(80, 20)); diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java index 56f6acc77..4ffd07839 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java @@ -98,7 +98,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ buttonPane.add(ok); buttonPane.add(cancel); - ok.setActionCommand("OK"); + ok.setActionCommand("Fine-Design_Chart_OK"); ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { seletePane.setColor(okListener.getColor()); diff --git a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java index 0e922bfc6..cfcc3543b 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java @@ -21,9 +21,9 @@ import java.awt.*; public class DateValuePane extends JPanel { private UIButtonGroup widgetValueHead; private Editor[] editor; - private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("None"); + private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"); private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); - private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"); + private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"); public DateValuePane() { @@ -45,7 +45,7 @@ public class DateValuePane extends JPanel { @Override public void stateChanged(ChangeEvent e) { int index = widgetValueHead.getSelectedIndex(); - if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("None"))) { + if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"))) { customPane.setVisible(false); } else { customPane.setVisible(true); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java index af5c7b7f7..7911028cf 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java @@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog { this.setModal(true); this.setLayout(new BorderLayout()); final ChartTypePane chartTypePane = new ChartTypePane(); - setTitle(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType")); + setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type")); this.applyClosingAction(); this.applyEscapeAction(); @@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog { this.add(buttonPane, BorderLayout.SOUTH); - ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); buttonPane.add(ok); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index 9b7ca0b78..81611adb7 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane { JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); spane.setDividerLocation(120); - spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("M-Popup_ChartType"))); + spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type"))); this.add(spane); iconViewList.setSelectedIndex(0); diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java index deedb9aee..f3e26baef 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/CustomChartStyleAxisPane.java @@ -10,7 +10,7 @@ public class CustomChartStyleAxisPane extends TernaryChartStyleAxisPane { } protected String getValueAxisName() { - return com.fr.design.i18n.Toolkit.i18nText("Main_Axis"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Axis"); } protected String getSecondValueAxisName() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java index 832d1c84c..de2d67cb5 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/comp/BorderAttriPane.java @@ -16,7 +16,7 @@ public class BorderAttriPane extends BasicPane { private ColorSelectBox colorSelectBox; public BorderAttriPane() { - this(com.fr.design.i18n.Toolkit.i18nText("Line-Style"), com.fr.design.i18n.Toolkit.i18nText("Color")); + this(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style"), com.fr.design.i18n.Toolkit.i18nText("Color")); } public BorderAttriPane(String lineString, String colorSting) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java index eda97f42f..188db90c2 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java +++ b/designer-chart/src/main/java/com/fr/design/chart/gui/active/action/SetChartStyleAciton.java @@ -18,7 +18,7 @@ public class SetChartStyleAciton extends ChartComponentAction { public SetChartStyleAciton(ChartComponent chartComponent) { super(chartComponent); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern")); } public void actionPerformed(ActionEvent e) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java index 96de41b5b..784f55e87 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java @@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit TextEditor textEidtor = new TextEditor(); initListeners(textEidtor); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); initListeners(formulaEditor); Editor[] editors = new Editor[]{textEidtor, formulaEditor}; diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java index 73e473e8d..e802e97a2 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java @@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer { private ValueEditorPane cellEditor; public MapReportRenderer() { - Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula"))}; + Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"))}; cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors); } 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 f033358cc..eafa20116 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 @@ -58,7 +58,7 @@ public class ConditionTrendLinePane extends BasicBeanPane { namePane.add(nameLabel = new UITextField("", 6)); pane.add(linePane = new BorderAttriPane()); - linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_Trend", "Line-Style"}), null)); + linePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trend_Line_Style"), null)); JPanel typePane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_S_Pane(); pane.add(typePane); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java index 79641b31a..bf9ba9b09 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/LabelLineStylePane.java @@ -29,7 +29,7 @@ public class LabelLineStylePane extends ConditionAttrSingleConditionPane { } private JPanel createTitleStylePane() { - final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); + final UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); styleAttrPane = new ChartTextAttrPane() { protected JPanel getContentPane(JPanel buttonPane) { double p = TableLayout.PREFERRED; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index b8db10307..c3ac2a3ed 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineColor = new ColorSelectBox(100); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("None")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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"), @@ -55,7 +55,7 @@ public class ChartAxisLineStylePane extends BasicPane{ Component[][] components = new Component[][]{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Type")),axisLineStyle} , new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")),axisLineColor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("MainGraduationLine")),null}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Line")),null}, new Component[]{null, mainTickPosition}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("SecondGraduationLine")),null}, new Component[]{null,secondTickPosition} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java index edc5e496f..381fe56dd 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBeautyPane.java @@ -17,7 +17,7 @@ public class ChartBeautyPane extends BasicBeanPane{ public ChartBeautyPane() { String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Common"), - com.fr.design.i18n.Toolkit.i18nText("Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Plane3D"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_HighLight"), com.fr.design.i18n.Toolkit.i18nText("TopDownShade"),com.fr.design.i18n.Toolkit.i18nText("Transparent") //新加的两种风格，注意兼容处理 }; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java index b0c9ff66a..a2b4f0bff 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartBorderPane.java @@ -34,7 +34,7 @@ public class ChartBorderPane extends BasicPane{ double[] columnSize = { p,f }; double[] rowSize = {p, p, p, p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")+":"),currentLineCombo}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")+":"),currentLineCombo}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Color")+":"),currentLineColorPane}, new Component[]{null,isRoundBorder} } ; diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java index 39f16e861..dea30d0c9 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartTextAttrPane.java @@ -165,7 +165,7 @@ public class ChartTextAttrPane extends BasicPane { } protected Component[][] getComponents(JPanel buttonPane) { - UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), SwingConstants.LEFT); + UILabel text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), SwingConstants.LEFT); return new Component[][]{ new Component[]{null, null}, new Component[]{text, fontNameComboBox}, diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 0a7e6bea6..2502e9b1a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java @@ -97,7 +97,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); minValueField.setEnabled(false); @@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); maxValueField.setEnabled(false); @@ -126,7 +126,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ private void initMain() { // 主要刻度单位 - mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("MainGraduationUnit")); + mainTickBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Main_Graduation_Unit")); mainUnitField = new UITextField(); mainUnitField.setPreferredSize(new Dimension(30, 20)); mainUnitField.setEditable(false); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java index f72aa8982..c43dbc64c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Area3DSeriesPane.java @@ -30,7 +30,7 @@ public class Area3DSeriesPane extends AbstractPlotSeriesPane { JPanel pane = new JPanel(); pane.setLayout(new BorderLayout()); - pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Pitch_Percentage") + ":"), BorderLayout.WEST); + pane.add(new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pitch_Percentage") + ":"), BorderLayout.WEST); pane.add(gapPane = new UINumberDragPane(0, 500), BorderLayout.CENTER); gapPane.populateBean(100.0); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java index c2f6e941f..e73f4a079 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomDefaultSeriesPane.java @@ -249,9 +249,9 @@ public class CustomDefaultSeriesPane extends BasicPane{ double[] rowSize = { p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; this.add(TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize), BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java index 1fb1b8d09..60c815be5 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/CustomTypeConditionSeriesPane.java @@ -458,9 +458,9 @@ public class CustomTypeConditionSeriesPane extends BasicBeanPane{ Component[][] components = new Component[][]{ new Component[]{positionPane, null}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Marker_Type")), markerPane}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java index 7b2712f87..3154522c5 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/LineSeriesPane.java @@ -58,9 +58,9 @@ public class LineSeriesPane extends AbstractPlotSeriesPane{ double[] rowSize = { p,p,p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Line-Style")),lineStyle}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")), isNullValueBreak} + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")), isNullValueBreak} }; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java index db7ba4257..50b485ae8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/Pie2DSeriesPane.java @@ -36,7 +36,7 @@ public class Pie2DSeriesPane extends AbstractPlotSeriesPane { protected void initCom() { stylePane = new ChartBeautyPane(); isSecondPlot = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Chart_Second_Plot")); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_PieStyle"), com.fr.design.i18n.Toolkit.i18nText("BarStyle")}; Integer[] valueArray = {0, 1}; secondPlotType = new UIButtonGroup(nameArray, valueArray); smallPercent = new UIBasicSpinner(new SpinnerNumberModel(5, 0, 100, 1)); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java index 5e07d0067..e478a3f7b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/RadarSeriesPane.java @@ -57,7 +57,7 @@ public class RadarSeriesPane extends AbstractPlotSeriesPane{ new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Line_Style")),isCurve}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),lineStyle }, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Marker_Type")), markerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Null_Value_Show")),isNullValueBreak} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Null_Value_Show")),isNullValueBreak} } ; return TableLayoutHelper.createTableLayoutPane(components,rowSize,columnSize); } diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java index d1cd31b2f..d764fb545 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java @@ -112,7 +112,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { private JPanel createHyperlinkPane() { hyperLinkPane = new ExtendedChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperLinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperLinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java index 5915d6a82..54fccde06 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java @@ -32,7 +32,7 @@ public class VanChartCustomInteractivePane extends VanChartInteractivePane { protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartCustomPlotHyperlinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperlinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java index c797285d8..d27b95f3b 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/style/VanChartCustomTooltipPane.java @@ -68,6 +68,6 @@ public class VanChartCustomTooltipPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip"); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java index e24b77639..3f759aabb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java @@ -38,7 +38,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane { }; transparent = new UINumberDragPane(0, 100); - JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Alpha"), transparent); + JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), transparent); this.setLayout(new BorderLayout()); this.add(fillColorPane, BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java index a5ee0ce44..97d24338f 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartBeautyPane.java @@ -28,7 +28,7 @@ public class VanChartBeautyPane extends BasicBeanPane { double[] columnSize = {f, e}; double[] rowSize = {p}; Component[][] components = new Component[][]{ - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Style")), styleBox}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style")), styleBox}, } ; JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java index e695f4d2f..6dee446c7 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java @@ -192,7 +192,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem } private void addOkButton(JPanel buttonsPane) { - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); buttonsPane.add(okButton); okButton.addActionListener(new ActionListener() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java index 86278cbe0..565183e54 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartGradientPane.java @@ -45,7 +45,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { Component[][] components = new Component[][]{ new Component[]{gradientBar, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Direction")),directionPane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Direction")),directionPane}, }; JPanel Gradient = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); this.setLayout(new BorderLayout()); @@ -99,7 +99,7 @@ public class VanChartGradientPane extends GradientBackgroundQuickPane { * @return 名称 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Gradient_Color"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Gradient_Color"); } } \ No newline at end of file diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index ca3d7c18f..7f1f3d754 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java @@ -259,7 +259,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected JPanel createHyperlinkPane() { superLink = new VanChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), superLink); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), superLink); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java index 2cec63a6d..ae047cc13 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/condition/item/VanChartDataSheetContentPane.java @@ -33,12 +33,12 @@ public class VanChartDataSheetContentPane extends AbstractNormalMultiLineConditi @Override public String nameForPopupMenuItem() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet"); } @Override protected String getItemLabelString() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Data_Sheet"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Data_Sheet"); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java index f6f5bc55e..77ad6e360 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java @@ -68,7 +68,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip"); } protected VanChartPlotTooltipPane getTooltipPane(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java index f058bda53..c08a67a65 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/data/comp/DrillMapLayerPane.java @@ -96,7 +96,7 @@ public class DrillMapLayerPane extends BasicScrollPane { detailComps = new Component[depth + 1][3]; rowSize[0] = p; detailComps[0] = new Component[]{ - new UILabel(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Descriptor")), + new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Descriptor")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Zoom_Layer")), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Map_Type")) }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java index a31aebfe1..7868c4aaf 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/drillmap/designer/other/VanChartDrillMapInteractivePane.java @@ -83,7 +83,7 @@ public class VanChartDrillMapInteractivePane extends VanChartInteractivePaneWith double[] rowSize = {p,p,p,p,p,p}; Component[][] components = new Component[][]{ new Component[]{null}, - new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Character"), textAttrPane)}, + new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Character"), textAttrPane)}, new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Background"), backgroundPane)}, new Component[]{createTitlePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Select_Color"), selectBackgroundPane)}, new Component[]{catalogSuperLink} diff --git a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java index d8b157a49..a08afc5eb 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gantt/designer/style/series/VanChartGanttSeriesPane.java @@ -53,7 +53,7 @@ public class VanChartGanttSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createGanntStylePane(){ seriesNewLine = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Open"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Close")}); JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_New_Line"),seriesNewLine); - JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style"), panel); + JPanel ganntStylePane = TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Pattern"), panel); return ganntStylePane; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java index 933378f3f..fbeef3283 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java @@ -67,7 +67,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createGaugeLayoutPane() { gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation"),gaugeLayout); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Page_Setup_Orientation"),gaugeLayout); gaugeLayout.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java index 5ef8e8a8f..bb1d317b6 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java @@ -23,7 +23,7 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo @Override protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartMapHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperlinkPane); } @Override protected void populateHyperlink(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java index b7508410d..b13599304 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/style/tooltip/VanChartMapTooltipPane.java @@ -123,7 +123,7 @@ public class VanChartMapTooltipPane extends AbstractVanChartScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Plugin-Chart_Tooltip"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Tooltip"); } } diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index 93fb4e239..5bb42ad06 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -69,7 +69,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); Component[][] coms = { @@ -99,12 +99,12 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java index e0521f5b1..e4bda729a 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java @@ -39,7 +39,7 @@ public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { setText(StringUtils.join("、", res)); } } else { - setText(com.fr.design.i18n.Toolkit.i18nText("None")); + setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")); } return this; } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java index 252b573d6..f310802f2 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java @@ -69,7 +69,7 @@ public class FormWidgetValuePane extends JPanel { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Parameter-Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: diff --git a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java index da9e5e396..979046829 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java @@ -117,9 +117,9 @@ public class ParentPane extends BasicPane { } }); - noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("None")); + noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")); noneParentText.setRectDirection(Constants.RIGHT); - parentCardPane.add("None", noneParentText); + parentCardPane.add("Fine-Design_Chart_None", noneParentText); defaultParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Default")); defaultParentText.setRectDirection(Constants.RIGHT); parentCardPane.add("Default", defaultParentText); @@ -174,7 +174,7 @@ public class ParentPane extends BasicPane { private UIPopupMenu createPopMenu() { UIPopupMenu pop = new UIPopupMenu(); pop.setOnlyText(true); - UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("None")); + UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")); if (cellAttrPaneListener != null) { noneItem.addActionListener(cellAttrPaneListener); } @@ -182,7 +182,7 @@ public class ParentPane extends BasicPane { @Override public void actionPerformed(ActionEvent e) { - cardLayout.show(parentCardPane, "None"); + cardLayout.show(parentCardPane, "Fine-Design_Chart_None"); } }); @@ -241,7 +241,7 @@ public class ParentPane extends BasicPane { this.cardLayout.show(parentCardPane, "Custom"); this.customParentColumnRowPane.populate(columnRow); } else { - this.cardLayout.show(parentCardPane, "None"); + this.cardLayout.show(parentCardPane, "Fine-Design_Chart_None"); this.customParentColumnRowPane.populate(ColumnRow.valueOf(0, 0)); } } diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java index 0e91c4e93..e8cc23ad0 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java @@ -433,7 +433,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane { } else if (selectionType == CellSelection.CHOOSE_COLUMN) { type.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Column")); } else { - type.setText(com.fr.design.i18n.Toolkit.i18nText("M_Insert-Float")); + type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert-Float")); } } diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index 16c85da0c..234ea78a7 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -159,7 +159,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); JPanel twoPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); twoPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("PageSetup-Orientation")); + JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Page_Setup_Orientation")); JPanel innerorientationPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); orientationPane.add(innerorientationPane); twoPane.add(orientationPane); diff --git a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java index c875fdcb4..ece392027 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java @@ -305,7 +305,7 @@ public abstract class CellQuickEditor extends QuickEditor { ColumnRow columnRowEdit = ColumnRow.valueOf(columnRowTextField.getText()); // barry:检查输入是否正确 if (!ColumnRow.validate(columnRowEdit)) { - Object[] options = {com.fr.design.i18n.Toolkit.i18nText("OK")}; + Object[] options = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")}; JOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Please_Input_Letters+Numbers(A1,AA1,A11....)"), com.fr.design.i18n.Toolkit.i18nText("Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]); // 重新选中当前的selection,把columnRowTextField From f6dd924d166149a6d4f6518e65424030fde0181e Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Mon, 6 Aug 2018 11:28:16 +0800 Subject: [PATCH 02/24] found and correct the bug --- .../java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java | 6 +++--- .../design/mainframe/widget/editors/WidgetValueEditor.java | 2 +- .../java/com/fr/design/widget/component/DateValuePane.java | 2 +- .../src/main/java/com/fr/design/chart/ChartDialog.java | 2 +- .../src/main/java/com/fr/design/chart/ChartTypePane.java | 2 +- .../java/com/fr/design/chart/report/MapReportEditor.java | 2 +- .../java/com/fr/design/chart/report/MapReportRenderer.java | 2 +- .../series/SeriesCondition/dlp/BubbleDataLabelPane.java | 2 +- .../SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java | 4 ++-- .../design/mainframe/chart/gui/style/DateAxisValuePane.java | 4 ++-- .../java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java | 6 +++--- .../widget/ui/designer/component/FormWidgetValuePane.java | 2 +- 12 files changed, 18 insertions(+), 18 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index df30ad625..437f4019e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); Component[][] coms = { @@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java index 39aed2e85..824a183cb 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java @@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: diff --git a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java index cfcc3543b..0fadacebc 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java @@ -23,7 +23,7 @@ public class DateValuePane extends JPanel { private Editor[] editor; private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"); private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); - private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"); + private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"); public DateValuePane() { diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java index 7911028cf..c0b838f41 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java @@ -43,7 +43,7 @@ public class ChartDialog extends MiddleChartDialog { this.setModal(true); this.setLayout(new BorderLayout()); final ChartTypePane chartTypePane = new ChartTypePane(); - setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type")); + setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type")); this.applyClosingAction(); this.applyEscapeAction(); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java index 81611adb7..028591d55 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartTypePane.java @@ -81,7 +81,7 @@ public class ChartTypePane extends ChartCommonWizardPane { JSplitPane spane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true, typeScrollPane, subListPane); spane.setDividerLocation(120); - spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M-Popup_Chart_Type"))); + spane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Popup_Chart_Type"))); this.add(spane); iconViewList.setSelectedIndex(0); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java index 784f55e87..dcb9a781e 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java @@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit TextEditor textEidtor = new TextEditor(); initListeners(textEidtor); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); initListeners(formulaEditor); Editor[] editors = new Editor[]{textEidtor, formulaEditor}; diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java index e802e97a2..2dd7aee63 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java @@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer { private ValueEditorPane cellEditor; public MapReportRenderer() { - Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula"))}; + Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"))}; cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java index 55b36859f..4a893a9b7 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/BubbleDataLabelPane.java @@ -32,7 +32,7 @@ public class BubbleDataLabelPane extends DataLabelPane { outSideButton.setSelected(true); JPanel buttonPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); - buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("+ \":\"") + ":")); + buttonPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Layout") + ":")); buttonPane.add(outSideButton); buttonPane.add(insideButton); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java index a293d7baa..30de45c3c 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java @@ -64,7 +64,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane{ minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); minValueField.setEnabled(false); @@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); maxValueField.setEnabled(false); diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index 5bb42ad06..573f750da 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -69,7 +69,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); Component[][] coms = { @@ -99,12 +99,12 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java index f310802f2..63429a6d6 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java @@ -69,7 +69,7 @@ public class FormWidgetValuePane extends JPanel { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter-Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: From 6e60ffc6061541d8b14378c91ad3de339a1cf6ae Mon Sep 17 00:00:00 2001 From: "Qinghui.Liu" Date: Mon, 6 Aug 2018 20:48:21 +0800 Subject: [PATCH 03/24] 'CHART-2705' --- .../mainframe/chart/gui/style/series/UIColorPickerPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java index 3d179e236..ef0c57ebb 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/UIColorPickerPane.java @@ -44,7 +44,7 @@ import java.util.ArrayList; import java.util.List; public class UIColorPickerPane extends BasicPane implements UIObserver { - private static final int MARGIN_TOP = 10; + private static final int MARGIN_TOP = 7; private static final int MARGIN_LEFT = 5; private static final int COLORGROUP_MARGIN_LEFT = 20; private static final int OFF_HEIGHT = 6; From 32b09725d17b83d3968375ae24396d38d635d316 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 7 Aug 2018 02:47:30 +0800 Subject: [PATCH 04/24] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/style/BorderPane.java | 2 +- .../java/com/fr/design/style/FontSizeStylePane.java | 8 ++++---- .../com/fr/design/chart/report/MapCubeDataPane.java | 2 +- .../chart/series/PlotSeries/MapImageEditPane.java | 4 ++-- .../series/SeriesCondition/ConditionTrendLinePane.java | 4 ++-- .../series/SeriesCondition/DataLabelContentsPane.java | 2 +- .../series/SeriesCondition/DataLabelStylePane.java | 10 +++++----- .../series/SeriesCondition/dlp/DataLabelPane.java | 6 +++--- .../data/report/BubblePlotReportDataContentPane.java | 2 +- .../chart/gui/style/ChartAxisLineStylePane.java | 2 +- .../chart/gui/style/datalabel/ChartLabelFontPane.java | 4 ++-- .../chart/gui/style/legend/ChartLegendPane.java | 2 +- .../chart/gui/style/series/MeterSeriesPane.java | 4 ++-- .../java/com/fr/design/module/ChartPreStyleAction.java | 2 +- .../actions/cell/style/ReportFontBoldAction.java | 2 +- .../actions/cell/style/ReportFontSizeAction.java | 2 +- .../fr/design/headerfooter/HFAttributesEditDialog.java | 2 +- 17 files changed, 30 insertions(+), 30 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/style/BorderPane.java index 3138de5e0..bfe4e1133 100644 --- a/designer-base/src/main/java/com/fr/design/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/style/BorderPane.java @@ -108,7 +108,7 @@ public class BorderPane extends BasicPane { // current color and current style excepting inside borders borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("External"))); - borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Inside"))); + borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner"))); // Control JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); diff --git a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java index 53a7d65b2..f11684873 100644 --- a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java +++ b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java @@ -35,10 +35,10 @@ public class FontSizeStylePane extends JPanel { fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null)); String[] styles = { - com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Plain"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")}; styleField = new UITextField(); styleField.setEditable(false); diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java index e60cb36f3..60e550db8 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapCubeDataPane.java @@ -45,7 +45,7 @@ public class MapCubeDataPane extends UIComboBoxPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("LayerData"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layer_Data"); } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java index ade5b8eae..df5d60c53 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/PlotSeries/MapImageEditPane.java @@ -122,7 +122,7 @@ public class MapImageEditPane extends BasicBeanPane { UIScrollPane pane = new UIScrollPane(recordTable); pane.setPreferredSize(new Dimension(150, 320)); - pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Filed", "WF-Name"}))); + pane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name"))); this.add(pane, BorderLayout.EAST); } @@ -480,7 +480,7 @@ public class MapImageEditPane extends BasicBeanPane { }); bg.setSize(NAME_EDIT_PANE_WIDTH, NAME_EDIT_PANE_HEIGHT); bg.setLocation((int) (e.getLocationOnScreen().getX()) + LOCATIONOFFSET, (int) e.getLocationOnScreen().getY()); - bg.setTitle(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Edit", "Filed", "WF-Name"})); + bg.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Filed_Name_Edit")); bg.setVisible(true); } 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 eafa20116..5350ffd4b 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 @@ -53,8 +53,8 @@ public class ConditionTrendLinePane extends BasicBeanPane { JPanel namePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); pane.add(namePane); - namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Chart_TrendLine" , "WF-Name"}), null)); - namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Define", "WF-Name"}))); + namePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Trendline_Name"), null)); + namePane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Define_Name"))); namePane.add(nameLabel = new UITextField("", 6)); pane.add(linePane = new BorderAttriPane()); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java index 6fe785511..611b85cb8 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelContentsPane.java @@ -25,7 +25,7 @@ public class DataLabelContentsPane extends BasicPane { @Override protected String title4PopupWindow() { - return "Label"; + return "Fine-Design_Chart_Label"; } /** diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java index 844dadb40..8e7fc33c7 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java @@ -40,10 +40,10 @@ public class DataLabelStylePane extends BasicPane { nameBox.setPreferredSize(new Dimension(80, 20)); String[] styles = { - com.fr.design.i18n.Toolkit.i18nText("FRFont-plain"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bold"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-italic"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-bolditalic")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Plain"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")}; this.add(fontStyleBox = new UIComboBox(styles)); fontStyleBox.setPreferredSize(new Dimension(80, 20)); @@ -66,7 +66,7 @@ public class DataLabelStylePane extends BasicPane { @Override protected String title4PopupWindow() { - return "Label"; + return "Fine-Design_Chart_Label"; } public void populate(AttrContents seriesAttrContents) { diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java index b135177b1..1be92b56e 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/DataLabelPane.java @@ -69,7 +69,7 @@ public class DataLabelPane extends TooltipContentsPane { protected Component[] createComponents4ShowSeriesName() { if (showSeriesNameCB == null) { - showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"ChartF-Series", "WF-Name"})); + showSeriesNameCB = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Series_Name")); } return new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "Include"}) + ":"), showSeriesNameCB}; } @@ -82,7 +82,7 @@ public class DataLabelPane extends TooltipContentsPane { } protected String getCategoryString(){ - return com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"StyleFormat-Category", "WF-Name"}); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Style_Format_Category_Name"); } @@ -105,7 +105,7 @@ public class DataLabelPane extends TooltipContentsPane { JPanel labelStylePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel westPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane(); labelStylePane.add(westPane, BorderLayout.WEST); - westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nTextArray(new String[]{"Label", "FRFont"}) + ":")); + westPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label_Font") + ":")); labelStylePane.add(stylePane = new DataLabelStylePane(), BorderLayout.CENTER); return labelStylePane; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java index 73559a805..29b1cc88b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/data/report/BubblePlotReportDataContentPane.java @@ -38,7 +38,7 @@ public class BubblePlotReportDataContentPane extends AbstractReportDataContentPa com.fr.design.i18n.Toolkit.i18nText("Bubble-Series_Name"), com.fr.design.i18n.Toolkit.i18nText("ChartF-X_Axis"), com.fr.design.i18n.Toolkit.i18nText("ChartF-Y_Axis"), - com.fr.design.i18n.Toolkit.i18nText("FRFont-Size") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size") }; } diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index c3ac2a3ed..b520e8b46 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -33,7 +33,7 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineStyle = new LineComboBox(CoreConstants.LINE_STYLE_ARRAY_4_AXIS); axisLineColor = new ColorSelectBox(100); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Inside"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("External"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner"),com.fr.design.i18n.Toolkit.i18nText("ChartF-Cross"),com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_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"), diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java index 0bba886b5..4287b0f67 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/datalabel/ChartLabelFontPane.java @@ -87,12 +87,12 @@ public class ChartLabelFontPane extends BasicScrollPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Label"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Label"); } private class ContentPane extends JPanel { private UILabel value = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Value")); - private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units")); + private UILabel unit = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units")); public ContentPane() { this.initComponents(); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java index 6186f96e3..ab7efa200 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/legend/ChartLegendPane.java @@ -78,7 +78,7 @@ public class ChartLegendPane extends BasicScrollPane{ Component[][] components = new Component[][]{ new Component[]{null,textAttrPane}, new Component[]{new JSeparator(),null}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Layout")),location} , + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout")),location} , new Component[]{new JSeparator(),null}, new Component[]{borderPane,null}, new Component[]{backgroundPane,null} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java index 859c8b556..84fa6751b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/series/MeterSeriesPane.java @@ -78,7 +78,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { JPanel orderPane = TableLayoutHelper.createTableLayoutPane(tmpComponent, rowSize, columnSize); Component[][] components = new Component[][]{ new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Chart_Needle_Max_Range") + ":", SwingUtilities.LEFT), angleMax}, - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit}, new Component[]{new JSeparator(), null}, new Component[]{orderPane, null}, new Component[]{colorPickerPane, null}, @@ -90,7 +90,7 @@ public class MeterSeriesPane extends AbstractPlotSeriesPane { return components; } else { components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart-Units") + ":", SwingUtilities.LEFT), unit}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Units") + ":", SwingUtilities.LEFT), unit}, new Component[]{new JSeparator(), null}, new Component[]{orderPane, null}, new Component[]{colorPickerPane, null}, diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java index b7630cba3..e0dbd8ba0 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartPreStyleAction.java @@ -72,7 +72,7 @@ public class ChartPreStyleAction extends UpdateAction { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Menu-Server_Chart_PreStyle"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Server_PreStyle"); } @Override diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java index 0a80b6753..46049857b 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java @@ -26,7 +26,7 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB public ReportFontBoldAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-bold")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold")); this.setSmallIcon(ICONS, true); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java index ee3c6d37c..231119bb6 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java @@ -27,7 +27,7 @@ public class ReportFontSizeAction extends AbstractStyleAction { public ReportFontSizeAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FRFont-Size")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size")); } /** diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java index efb1f2a92..4e334cdd5 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java @@ -238,7 +238,7 @@ public class HFAttributesEditDialog extends BasicPane { } private void addReportFontPaneToTab() { - this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("FRFont"), this.frFontPane); + this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font"), this.frFontPane); } private void addFormatPaneToTab() { From 286f6363410939a711532599ccf9c9f2f6cbe55e Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 7 Aug 2018 11:58:13 +0800 Subject: [PATCH 05/24] =?UTF-8?q?=E7=9B=B8=E5=BA=94=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/actions/help/AboutDialog.java | 2 +- .../java/com/fr/design/actions/help/FeedBackPane.java | 2 +- .../data/datapane/connect/DatabaseConnectionPane.java | 2 +- .../java/com/fr/design/dialog/InformationWarnPane.java | 2 +- .../src/main/java/com/fr/design/dialog/UIDialog.java | 2 +- .../java/com/fr/design/gui/date/UICalendarPanel.java | 2 +- .../com/fr/design/gui/frpane/JTreeAutoBuildPane.java | 6 +++--- .../fr/design/gui/icombobox/DictionaryConstants.java | 4 ++-- .../java/com/fr/design/gui/icombobox/LineComboBox.java | 2 +- .../java/com/fr/design/gui/iscrollbar/UISBChooser.java | 2 +- .../java/com/fr/design/layout/TableLayoutTest.java | 2 +- .../mainframe/widget/editors/WidgetValueEditor.java | 2 +- .../mainframe/widget/wrappers/BackgroundWrapper.java | 2 +- .../src/main/java/com/fr/design/menu/KeySetUtils.java | 4 ++-- .../src/main/java/com/fr/design/style/AlphaPane.java | 2 +- .../src/main/java/com/fr/design/style/BorderPane.java | 2 +- .../java/com/fr/design/style/FontSizeStylePane.java | 8 ++++---- .../com/fr/design/style/color/ColorSelectDialog.java | 2 +- .../com/fr/design/widget/component/DateValuePane.java | 6 +++--- .../src/main/java/com/fr/design/chart/ChartDialog.java | 2 +- .../com/fr/design/chart/axis/ChartAlertValuePane.java | 4 ++-- .../com/fr/design/chart/report/MapReportEditor.java | 2 +- .../com/fr/design/chart/report/MapReportRenderer.java | 2 +- .../series/SeriesCondition/DataLabelStylePane.java | 8 ++++---- .../impl/ChartHyperRelateFloatLinkPane.java | 2 +- .../java/com/fr/design/gui/xcombox/MarkerComboBox.java | 2 +- .../data/report/BubblePlotReportDataContentPane.java | 2 +- .../chart/gui/style/ChartAxisLineStylePane.java | 2 +- .../mainframe/chart/gui/style/DateAxisValuePane.java | 4 ++-- .../java/com/fr/extended/chart/ExtendedOtherPane.java | 2 +- .../custom/other/VanChartCustomInteractivePane.java | 2 +- .../component/VanChartAreaSeriesFillColorPane.java | 2 +- .../designer/component/VanChartUIListControlPane.java | 2 +- .../component/background/VanChartBackgroundPane.java | 2 +- .../VanChartBackgroundPaneWithOutImageAndShadow.java | 2 +- .../VanChartBackgroundWithOutShadowWithRadiusPane.java | 2 +- .../component/border/VanChartBorderWithAlphaPane.java | 2 +- .../chart/designer/other/VanChartInteractivePane.java | 2 +- .../VanChartCustomIntervalBackgroundPane.java | 2 +- .../style/series/VanChartAbstractPlotSeriesPane.java | 2 +- .../gantt/designer/style/axis/GanttAxisStylePane.java | 2 +- .../fr/van/chart/gauge/VanChartGaugeSeriesPane.java | 2 +- .../designer/style/VanChartHeatMapSeriesPane.java | 2 +- .../com/fr/van/chart/map/VanChartMapSeriesPane.java | 2 +- .../map/designer/other/VanChartMapInteractivePane.java | 2 +- .../com/fr/van/chart/map/line/VanChartCurvePane.java | 2 +- .../desinger/style/StructureNodeStylePane.java | 2 +- .../desinger/style/VanChartStructureSeriesPane.java | 2 +- .../com/fr/design/gui/xpane/JTreeAutoBuildPane.java | 6 +++--- .../widget/editors/BorderLayoutDirectionEditor.java | 2 +- .../ui/designer/component/FormWidgetValuePane.java | 2 +- .../actions/cell/style/ReportFontBoldAction.java | 2 +- .../actions/cell/style/ReportFontSizeAction.java | 2 +- .../src/main/java/com/fr/design/expand/ParentPane.java | 10 +++++----- .../fr/design/headerfooter/HFAttributesEditDialog.java | 2 +- .../mainframe/ElementCasePaneAuthorityEditPane.java | 2 +- .../main/java/com/fr/design/report/PageSetupPane.java | 2 +- .../main/java/com/fr/quickeditor/CellQuickEditor.java | 2 +- 58 files changed, 78 insertions(+), 78 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java index c5b3ba2d8..af62e25fc 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutDialog.java @@ -40,7 +40,7 @@ public class AboutDialog extends JDialog implements ActionListener { JPanel defaultPane=FRGUIPaneFactory.createBorderLayout_L_Pane(); this.setContentPane(defaultPane); - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); okButton.addActionListener(this); tabbedPane = new UITabbedPane(); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java index d02342b6d..a72b35e31 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/FeedBackPane.java @@ -68,7 +68,7 @@ public class FeedBackPane extends BasicPane { private static final String ALLOWED_INTEGER_TYPE = "0123456789"; private SwingWorker worker; private JDialog dlg = new JDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Send"), true); - private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); + private UIButton ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); private UIButton cancle = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); private int ifHasBeenWriten = 0; private UITextArea detailField; diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java index 346bcdec3..e867febd5 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/connect/DatabaseConnectionPane.java @@ -48,7 +48,7 @@ public abstract class DatabaseConnectionPane" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK") + "") { + okButton = new UIButton("" + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK") + "") { @Override public Dimension getPreferredSize() { // TODO Auto-generated method stub diff --git a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java index 7b582441a..c70470588 100644 --- a/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java +++ b/designer-base/src/main/java/com/fr/design/dialog/UIDialog.java @@ -113,7 +113,7 @@ public abstract class UIDialog extends JDialog { } private void addOkButton(JPanel buttonsPane) { - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); okButton.setName(OK_BUTTON); okButton.setMnemonic('O'); buttonsPane.add(okButton); diff --git a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java index 7b4498f2c..9a8f1c011 100644 --- a/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java +++ b/designer-base/src/main/java/com/fr/design/gui/date/UICalendarPanel.java @@ -213,7 +213,7 @@ public class UICalendarPanel extends JPanel { gap.setPreferredSize(new Dimension(26,1)); sPane.add(gap); - UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")) { + UIButton okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")) { public Dimension getPreferredSize() { return new Dimension(32,18); } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java index 437f4019e..49402b950 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/JTreeAutoBuildPane.java @@ -74,7 +74,7 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor()}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new ColumnNameEditor(), new ColumnIndexEditor(), formulaEditor}); Component[][] coms = { @@ -104,12 +104,12 @@ public class JTreeAutoBuildPane extends BasicPane implements PreviewLabel.Previe String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length)}, columnNames[0]); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new ColumnNameEditor(columnNames), new ColumnIndexEditor(columnNames.length), formulaEditor}, columnNames[0]); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java index caa246289..69af3a729 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/DictionaryConstants.java @@ -17,7 +17,7 @@ public class DictionaryConstants { "^\\d{6}$" }; public final static String[] regexpsDisplays = new String[] { - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), com.fr.design.i18n.Toolkit.i18nText("Required"), com.fr.design.i18n.Toolkit.i18nText("Length"), com.fr.design.i18n.Toolkit.i18nText("Float"), @@ -55,7 +55,7 @@ public class DictionaryConstants { }; public static final String[] symbolDisplays = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), com.fr.design.i18n.Toolkit.i18nText("Form-Single_quote"), com.fr.design.i18n.Toolkit.i18nText("Form-Double_quotes") }; diff --git a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java index 115b62d1e..74cd42a7e 100644 --- a/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java +++ b/designer-base/src/main/java/com/fr/design/gui/icombobox/LineComboBox.java @@ -88,7 +88,7 @@ public class LineComboBox extends UIComboBox { FontMetrics fm = GraphHelper.getFontMetrics(rfont); if (style == Constants.LINE_NONE) { //draw "none" string - GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); + GraphHelper.drawString(g2d, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"), 4, (d.height - fm.getHeight()) / 2 + fm.getAscent()); } else { GraphHelper.drawLine(g2d, 4, d.height / 2, d.width - 8, d.height / 2, style); } diff --git a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java index f4edc3685..56dfbbdae 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java +++ b/designer-base/src/main/java/com/fr/design/gui/iscrollbar/UISBChooser.java @@ -106,7 +106,7 @@ public class UISBChooser extends JDialog { JButton b = new JButton("Cancel"); b.addActionListener(new CancelAction()); p3.add(b); - b = new JButton("Fine-Design_Chart_OK"); + b = new JButton("Fine-Design_Report_OK"); getRootPane().setDefaultButton(b); b.addActionListener(new OKAction()); p3.add(b); diff --git a/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java b/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java index 8905fee05..6d515cec4 100644 --- a/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java +++ b/designer-base/src/main/java/com/fr/design/layout/TableLayoutTest.java @@ -57,7 +57,7 @@ public class TableLayoutTest extends JFrame UITextField textfieldState = new UITextField(2); UITextField textfieldZip = new UITextField(5); - UIButton buttonOk = new UIButton("Fine-Design_Chart_OK"); + UIButton buttonOk = new UIButton("Fine-Design_Report_OK"); UIButton buttonCancel = new UIButton("Cancel"); JPanel panelButton = new JPanel(); panelButton.add(buttonOk); diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java index 824a183cb..30307a4b2 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/editors/WidgetValueEditor.java @@ -39,7 +39,7 @@ public class WidgetValueEditor extends AbstractPropertyEditor { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java index 0303bffc8..952a0e07e 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java @@ -35,7 +35,7 @@ public class BackgroundWrapper implements Encoder, Decoder { } else if (v instanceof GradientBackground) { return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); } else { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"); } } diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 9f7acf143..c19a9f668 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -879,7 +879,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"); } @Override @@ -990,7 +990,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert-Float"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java index 8829fb847..4560f84df 100644 --- a/designer-base/src/main/java/com/fr/design/style/AlphaPane.java +++ b/designer-base/src/main/java/com/fr/design/style/AlphaPane.java @@ -50,7 +50,7 @@ public class AlphaPane extends JPanel { alphaPane.setBorder(BorderFactory.createEmptyBorder()); this.add(alphaPane, BorderLayout.CENTER); - alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha") + ":")); + alphaPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha") + ":")); alphaPane.add(alphaSlider = new UISlider(UISlider.HORIZONTAL, 0, ALPHA_FLOAT, START_VALUE)); alphaSlider.setPreferredSize(new Dimension(80, 20)); diff --git a/designer-base/src/main/java/com/fr/design/style/BorderPane.java b/designer-base/src/main/java/com/fr/design/style/BorderPane.java index 9f1dabc0e..8be6e4cf9 100644 --- a/designer-base/src/main/java/com/fr/design/style/BorderPane.java +++ b/designer-base/src/main/java/com/fr/design/style/BorderPane.java @@ -108,7 +108,7 @@ public class BorderPane extends BasicPane { // current color and current style excepting inside borders borderAllControlPane.add(createVerButtonPane(EXTERNAL_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_External"))); - borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Inner"))); + borderAllControlPane.add(createVerButtonPane(INSIDE_BORDERS, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Inner"))); // Control JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); diff --git a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java index f11684873..928d1d80d 100644 --- a/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java +++ b/designer-base/src/main/java/com/fr/design/style/FontSizeStylePane.java @@ -35,10 +35,10 @@ public class FontSizeStylePane extends JPanel { fontVSizPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Style_Font_Size"), null)); String[] styles = { - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Plain"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")}; styleField = new UITextField(); styleField.setEditable(false); diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java index 4ffd07839..0dc0ca42b 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectDialog.java @@ -98,7 +98,7 @@ public class ColorSelectDialog extends MiddleChartDialog{ buttonPane.add(ok); buttonPane.add(cancel); - ok.setActionCommand("Fine-Design_Chart_OK"); + ok.setActionCommand("Fine-Design_Report_OK"); ok.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { seletePane.setColor(okListener.getColor()); diff --git a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java index 0fadacebc..ddcb98f86 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/DateValuePane.java @@ -21,9 +21,9 @@ import java.awt.*; public class DateValuePane extends JPanel { private UIButtonGroup widgetValueHead; private Editor[] editor; - private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"); + private static final String NONE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"); private static final String DATE_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Date"); - private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"); + private static final String FORMULA_EDITOR_NAME = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"); public DateValuePane() { @@ -45,7 +45,7 @@ public class DateValuePane extends JPanel { @Override public void stateChanged(ChangeEvent e) { int index = widgetValueHead.getSelectedIndex(); - if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None"))) { + if (ComparatorUtils.equals(tabTitles[index], com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"))) { customPane.setVisible(false); } else { customPane.setVisible(true); diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java index c0b838f41..8e13f0e9d 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDialog.java @@ -55,7 +55,7 @@ public class ChartDialog extends MiddleChartDialog { this.add(buttonPane, BorderLayout.SOUTH); - ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); + ok = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); cancel = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Cancel")); buttonPane.add(ok); diff --git a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java index 8f6a3c629..d0244ceba 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/axis/ChartAlertValuePane.java @@ -131,8 +131,8 @@ public class ChartAlertValuePane extends BasicBeanPane { double[] columnSize = {0.1, 0.2, 0.5, 0.2}; Component[][] components= { {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content") + ":"), contentField = new UITextField(3)}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font") + ":"), fontNameBox}, - {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size") + ":"), fontSizeBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font") + ":"), fontNameBox}, + {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size") + ":"), fontSizeBox}, {null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Layout") + ": "), leftButton = new UIRadioButton(getLeftName())}, {null, null, rightButton = new UIRadioButton(getRightName())}, diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java index dcb9a781e..95411c936 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportEditor.java @@ -46,7 +46,7 @@ public class MapReportEditor extends AbstractCellEditor implements TableCellEdit TextEditor textEidtor = new TextEditor(); initListeners(textEidtor); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); initListeners(formulaEditor); Editor[] editors = new Editor[]{textEidtor, formulaEditor}; diff --git a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java index 2dd7aee63..2e914e37a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java +++ b/designer-chart/src/main/java/com/fr/design/chart/report/MapReportRenderer.java @@ -21,7 +21,7 @@ public class MapReportRenderer extends DefaultTableCellRenderer { private ValueEditorPane cellEditor; public MapReportRenderer() { - Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula"))}; + Editor[] editors = new Editor[]{new TextEditor(), new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula"))}; cellEditor = ValueEditorPaneFactory.createValueEditorPane(editors); } diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java index 8e7fc33c7..a2047b4e1 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/DataLabelStylePane.java @@ -40,10 +40,10 @@ public class DataLabelStylePane extends BasicPane { nameBox.setPreferredSize(new Dimension(80, 20)); String[] styles = { - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Plain"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Italic"), - com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold_Italic")}; + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Plain"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Italic"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold_Italic")}; this.add(fontStyleBox = new UIComboBox(styles)); fontStyleBox.setPreferredSize(new Dimension(80, 20)); diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java index 30de45c3c..d79bf0443 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperRelateFloatLinkPane.java @@ -59,7 +59,7 @@ public class ChartHyperRelateFloatLinkPane extends AbstractHyperLinkPane>>>>>> 4c1c2515a1aee68b5a9e8d9b51be5a4a9d3fb1d6 diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 7f4e25823..66f704711 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java @@ -97,7 +97,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ minCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Min_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; minValueField = new ValueEditorPane(editor); minValueField.setEnabled(false); @@ -113,7 +113,7 @@ public class DateAxisValuePane extends FurtherBasicBeanPane{ maxCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Max_Value")); Date tmp = null; DateEditor dateEditor = new DateEditor(tmp, true, com.fr.design.i18n.Toolkit.i18nText("Date"), UIDatePicker.STYLE_CN_DATETIME1); - Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + Editor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); Editor[] editor = new Editor[]{dateEditor, formulaEditor}; maxValueField = new ValueEditorPane(editor); maxValueField.setEnabled(false); diff --git a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java index d764fb545..099c008d2 100644 --- a/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java +++ b/designer-chart/src/main/java/com/fr/extended/chart/ExtendedOtherPane.java @@ -112,7 +112,7 @@ public class ExtendedOtherPane extends AbstractChartAttrPane { private JPanel createHyperlinkPane() { hyperLinkPane = new ExtendedChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperLinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperLinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java index 54fccde06..f399d90e8 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/custom/other/VanChartCustomInteractivePane.java @@ -32,7 +32,7 @@ public class VanChartCustomInteractivePane extends VanChartInteractivePane { protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartCustomPlotHyperlinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperlinkPane); } @Override diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java index 3f759aabb..24400cacd 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartAreaSeriesFillColorPane.java @@ -38,7 +38,7 @@ public class VanChartAreaSeriesFillColorPane extends BasicPane { }; transparent = new UINumberDragPane(0, 100); - JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), transparent); + JPanel transparentPane = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), transparent); this.setLayout(new BorderLayout()); this.add(fillColorPane, BorderLayout.NORTH); diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java index 6dee446c7..90e3302c3 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartUIListControlPane.java @@ -192,7 +192,7 @@ public abstract class VanChartUIListControlPane extends UIListControlPane implem } private void addOkButton(JPanel buttonsPane) { - okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")); + okButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")); buttonsPane.add(okButton); okButton.addActionListener(new ActionListener() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java index c7484ced9..99306f4ba 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPane.java @@ -101,7 +101,7 @@ public class VanChartBackgroundPane extends BasicPane { new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Shadow")), shadow}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java index ab469c02a..e6dfa45cf 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundPaneWithOutImageAndShadow.java @@ -49,7 +49,7 @@ public class VanChartBackgroundPaneWithOutImageAndShadow extends VanChartBackgro return new Component[][]{ new Component[]{typeComboBox, null}, new Component[]{centerPane, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java index 212eb9959..c1c0aa909 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/background/VanChartBackgroundWithOutShadowWithRadiusPane.java @@ -25,7 +25,7 @@ public class VanChartBackgroundWithOutShadowWithRadiusPane extends VanChartBackg new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Shape_Fill")), typeComboBox}, new Component[]{null, centerPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("plugin-ChartF_Radius")),radius} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java index 69124e03d..a9edf4cd5 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/border/VanChartBorderWithAlphaPane.java @@ -31,7 +31,7 @@ public class VanChartBorderWithAlphaPane extends VanChartBorderPane{ new Component[]{null,null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Style")),currentLineCombo}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),currentLineColorPane}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java index 7f1f3d754..3b85485ad 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/other/VanChartInteractivePane.java @@ -259,7 +259,7 @@ public class VanChartInteractivePane extends AbstractVanChartScrollPane { protected JPanel createHyperlinkPane() { superLink = new VanChartHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), superLink); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), superLink); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java index 77ad6e360..9f27487dd 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartCustomIntervalBackgroundPane.java @@ -68,7 +68,7 @@ public class VanChartCustomIntervalBackgroundPane extends BasicBeanPane { Component[][] components = new Component[][]{ new Component[]{textAttrPane, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), colorSelectBox4button}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), transparent} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), transparent} }; JPanel content = TableLayoutHelper.createTableLayoutPane(components, row, col); diff --git a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java index fbeef3283..7c7648464 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/gauge/VanChartGaugeSeriesPane.java @@ -67,7 +67,7 @@ public class VanChartGaugeSeriesPane extends VanChartAbstractPlotSeriesPane { private JPanel createGaugeLayoutPane() { gaugeLayout = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Horizontal"), com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Direction_Vertical")}); - JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Page_Setup_Orientation"),gaugeLayout); + JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation"),gaugeLayout); gaugeLayout.addChangeListener(new ChangeListener() { @Override public void stateChanged(ChangeEvent e) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java index c6f330fa4..455cd5d75 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/heatmap/designer/style/VanChartHeatMapSeriesPane.java @@ -140,7 +140,7 @@ public class VanChartHeatMapSeriesPane extends VanChartMapSeriesPane { JPanel panel = TableLayout4VanChartHelper.createGapTableLayoutPane(components, row, col); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), panel); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), panel); } diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java index 906f171e8..5e7a651fc 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/VanChartMapSeriesPane.java @@ -244,7 +244,7 @@ public class VanChartMapSeriesPane extends VanChartAbstractPlotSeriesPane { //不透明度 private JPanel createPointAlphaPane() { pointAlphaPane = new UINumberDragPane(0, 100); - return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha"), pointAlphaPane); + return TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha"), pointAlphaPane); } private JPanel createPointEffectPane() { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java index bb1d317b6..241960414 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/designer/other/VanChartMapInteractivePane.java @@ -23,7 +23,7 @@ public class VanChartMapInteractivePane extends VanChartInteractivePaneWithMapZo @Override protected JPanel createHyperlinkPane() { hyperlinkPane = new VanChartMapHyperLinkPane(); - return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert_Hyperlink"), hyperlinkPane); + return TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert_Hyperlink"), hyperlinkPane); } @Override protected void populateHyperlink(Plot plot) { diff --git a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java index 18b74422b..df14ff555 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/map/line/VanChartCurvePane.java @@ -49,7 +49,7 @@ public class VanChartCurvePane extends BasicBeanPane{ new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Line_Width")), lineWidth}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Bedding")),bending}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), lineAlphaPane} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), lineAlphaPane} }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java index ab8616419..3f8bdafb0 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java @@ -59,7 +59,7 @@ public class StructureNodeStylePane extends BasicBeanPane { new Component[]{jPanel, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Width")), nodeBorderWidth}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), nodeOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), nodeOpacity} }; JPanel panel1 = TableLayout4VanChartHelper.createGapTableLayoutPane(components1, rowSize, columnSize); diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java index becf0da32..231ceb7c2 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java @@ -84,7 +84,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane new Component[]{null, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")), linkColor}, new Component[]{jPanel, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Alpha")), linkOpacity} + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), linkOpacity} }; JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java index 573f750da..88acae8d5 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/JTreeAutoBuildPane.java @@ -69,7 +69,7 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab this.add(selectTreeDataPanel, BorderLayout.NORTH); valuePane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns"))}); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane = ValueEditorPaneFactory.createValueEditorPane(new Editor[]{new OldColumnIndexEditor(com.fr.design.i18n.Toolkit.i18nText("Columns")), formulaEditor}); Component[][] coms = { @@ -99,12 +99,12 @@ public class JTreeAutoBuildPane extends BasicPane implements Previewable, Editab String[] columnNames = new String[namelist.size()]; namelist.toArray(columnNames); valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(columnNames, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } catch (Exception e) { valuePane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName"))}, 1); - FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + FormulaEditor formulaEditor = new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); formulaEditor.setEnabled(true); textPane.setEditors(new Editor[]{new OldColumnIndexEditor(100, com.fr.design.i18n.Toolkit.i18nText("ColumnName")), formulaEditor}, 1); } diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java index e4bda729a..3d6249f2b 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/BorderLayoutDirectionEditor.java @@ -39,7 +39,7 @@ public class BorderLayoutDirectionEditor extends AbstractPropertyEditor { setText(StringUtils.join("、", res)); } } else { - setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")); + setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")); } return this; } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java index 63429a6d6..aedf4d65d 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/component/FormWidgetValuePane.java @@ -69,7 +69,7 @@ public class FormWidgetValuePane extends JPanel { case DataControl.TYPE_NUMBER: return new DoubleEditor(); case DataControl.TYPE_FORMULA: - return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Parameter_Formula")); + return new FormulaEditor(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Parameter_Formula")); case DataControl.TYPE_DATABINDING: return onlyServer ? new ServerDataBindingEditor() : new DataBindingEditor(); case DataControl.TYPE_STRING: diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java index 46049857b..e819eb6fc 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontBoldAction.java @@ -26,7 +26,7 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB public ReportFontBoldAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Bold")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Bold")); this.setSmallIcon(ICONS, true); } diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java index 231119bb6..7a3563be4 100644 --- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java +++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontSizeAction.java @@ -27,7 +27,7 @@ public class ReportFontSizeAction extends AbstractStyleAction { public ReportFontSizeAction(ElementCasePane t) { super(t); - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font_Size")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font_Size")); } /** diff --git a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java index 979046829..f7014f015 100644 --- a/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java +++ b/designer-realize/src/main/java/com/fr/design/expand/ParentPane.java @@ -117,9 +117,9 @@ public class ParentPane extends BasicPane { } }); - noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")); + noneParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")); noneParentText.setRectDirection(Constants.RIGHT); - parentCardPane.add("Fine-Design_Chart_None", noneParentText); + parentCardPane.add("Fine-Design_Report_None", noneParentText); defaultParentText = new UITextField(com.fr.design.i18n.Toolkit.i18nText("Default")); defaultParentText.setRectDirection(Constants.RIGHT); parentCardPane.add("Default", defaultParentText); @@ -174,7 +174,7 @@ public class ParentPane extends BasicPane { private UIPopupMenu createPopMenu() { UIPopupMenu pop = new UIPopupMenu(); pop.setOnlyText(true); - UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_None")); + UIMenuItem noneItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None")); if (cellAttrPaneListener != null) { noneItem.addActionListener(cellAttrPaneListener); } @@ -182,7 +182,7 @@ public class ParentPane extends BasicPane { @Override public void actionPerformed(ActionEvent e) { - cardLayout.show(parentCardPane, "Fine-Design_Chart_None"); + cardLayout.show(parentCardPane, "Fine-Design_Report_None"); } }); @@ -241,7 +241,7 @@ public class ParentPane extends BasicPane { this.cardLayout.show(parentCardPane, "Custom"); this.customParentColumnRowPane.populate(columnRow); } else { - this.cardLayout.show(parentCardPane, "Fine-Design_Chart_None"); + this.cardLayout.show(parentCardPane, "Fine-Design_Report_None"); this.customParentColumnRowPane.populate(ColumnRow.valueOf(0, 0)); } } diff --git a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java index 4e334cdd5..4ed329cbe 100644 --- a/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java +++ b/designer-realize/src/main/java/com/fr/design/headerfooter/HFAttributesEditDialog.java @@ -238,7 +238,7 @@ public class HFAttributesEditDialog extends BasicPane { } private void addReportFontPaneToTab() { - this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Font"), this.frFontPane); + this.tabbedPane.addTab(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Font"), this.frFontPane); } private void addFormatPaneToTab() { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java index e8cc23ad0..c8f73fd64 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneAuthorityEditPane.java @@ -433,7 +433,7 @@ public class ElementCasePaneAuthorityEditPane extends AuthorityEditPane { } else if (selectionType == CellSelection.CHOOSE_COLUMN) { type.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Column")); } else { - type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_M_Insert-Float")); + type.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Insert-Float")); } } diff --git a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java index be3b7d1d4..194f99dbf 100644 --- a/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java +++ b/designer-realize/src/main/java/com/fr/design/report/PageSetupPane.java @@ -159,7 +159,7 @@ public class PageSetupPane extends BasicPane { this.add(defaultPane, BorderLayout.NORTH); JPanel twoPane = FRGUIPaneFactory.createX_AXISBoxInnerContainer_S_Pane(); twoPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); - JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Page_Setup_Orientation")); + JPanel orientationPane = FRGUIPaneFactory.createTitledBorderPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Page_Setup_Orientation")); JPanel innerorientationPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_M_Pane(); orientationPane.add(innerorientationPane); twoPane.add(orientationPane); diff --git a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java index ece392027..35c836da6 100644 --- a/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java +++ b/designer-realize/src/main/java/com/fr/quickeditor/CellQuickEditor.java @@ -305,7 +305,7 @@ public abstract class CellQuickEditor extends QuickEditor { ColumnRow columnRowEdit = ColumnRow.valueOf(columnRowTextField.getText()); // barry:检查输入是否正确 if (!ColumnRow.validate(columnRowEdit)) { - Object[] options = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_OK")}; + Object[] options = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_OK")}; JOptionPane.showOptionDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Please_Input_Letters+Numbers(A1,AA1,A11....)"), com.fr.design.i18n.Toolkit.i18nText("Warning"), JOptionPane.DEFAULT_OPTION, JOptionPane.WARNING_MESSAGE, null, options, options[0]); // 重新选中当前的selection,把columnRowTextField From ea4b52dcc6ed3642ded8fe375aefbd5fe14955e4 Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 7 Aug 2018 14:32:44 +0800 Subject: [PATCH 06/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=9C=AC=E6=9D=A5=E5=B0=B1=E6=98=AF=E9=BB=98=E8=AE=A4=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=97=B6=E8=B5=B7=E4=B8=8D=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 104f6f847..0398d8fe7 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -547,9 +547,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { * 设置当前环境为默认 */ public void setCurrentEnv2Default() { - if (isCurrentEnvDefault()) { - return; - } + try { final String envName = getDefaultEnvName(); WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()), new WorkContextCallback() { From abf710c04ec1e1e6416041f786c116c1fd10383f Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 7 Aug 2018 14:33:38 +0800 Subject: [PATCH 07/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=9C=AC=E6=9D=A5=E5=B0=B1=E6=98=AF=E9=BB=98=E8=AE=A4=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=97=B6=E8=B5=B7=E4=B8=8D=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 104f6f847..73f9e6fef 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -547,9 +547,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { * 设置当前环境为默认 */ public void setCurrentEnv2Default() { - if (isCurrentEnvDefault()) { - return; - } + try { final String envName = getDefaultEnvName(); WorkContext.switchTo(DesignerWorkspaceGenerator.generate(getDefaultConfig()), new WorkContextCallback() { From c9579cbb9b0d94342ebbffa900c0c2f731b25658 Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 7 Aug 2018 14:37:20 +0800 Subject: [PATCH 08/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=9C=AC=E6=9D=A5=E5=B0=B1=E6=98=AF=E9=BB=98=E8=AE=A4=E8=B7=AF?= =?UTF-8?q?=E5=BE=84=E6=97=B6=E8=B5=B7=E4=B8=8D=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/design/DesignerEnvManager.java | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 973e301c9..31420316d 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -482,20 +482,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { public void setLastEastRegionContainerWidth(int eastRegionContainerWidth) { this.eastRegionContainerWidth = eastRegionContainerWidth; } - - - /** - * 判断当前环境是否为默认 - * - * @return 是默认则返回true - */ - public boolean isCurrentEnvDefault() { - - DesignerWorkspaceInfo current = this.getWorkspaceInfo(curEnvName); - String defaultEnvPath = getDefaultenvPath(StableUtils.getInstallHome()); - return ComparatorUtils.equals(defaultEnvPath, current.getPath()); - } - + /** * 返回默认环境 */ From 5cedf5c7b99b07d9e2137315fca726f06a9a7818 Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 7 Aug 2018 14:39:39 +0800 Subject: [PATCH 09/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=B4=A8=E9=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/fr/start/module/DesignerWorkspaceProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java index 211e67db3..cd9479c7d 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerWorkspaceProvider.java @@ -28,7 +28,7 @@ public class DesignerWorkspaceProvider extends Activator { String current = DesignerEnvManager.getEnvManager().getCurEnvName(); DesignerWorkspaceInfo workspaceInfo = DesignerEnvManager.getEnvManager().getWorkspaceInfo(current); Workspace workspace = DesignerWorkspaceGenerator.generate(workspaceInfo); - boolean checkValid = workspace == null ? false : workspaceInfo.checkValid(); + boolean checkValid = workspace != null && workspaceInfo.checkValid(); if (!checkValid) { TemplatePane.getInstance().dealEvnExceptionWhenStartDesigner(); } else { From c21c61b1409e034aceb834ab10d578c59844f531 Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 7 Aug 2018 14:41:06 +0800 Subject: [PATCH 10/24] debug --- .../fr/design/mainframe/chart/gui/other/TimeSwitchPane.java | 6 +++--- .../mainframe/chart/gui/style/ChartAxisLineStylePane.java | 6 ++---- .../design/mainframe/chart/gui/style/DateAxisValuePane.java | 6 +++--- .../chart/gui/style/axis/ChartSecondValueNoFormulaPane.java | 2 +- 4 files changed, 9 insertions(+), 11 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java index 7c3838349..2cc21f753 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/other/TimeSwitchPane.java +++ b/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 INTS = new HashMap(); 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")); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index e7d31960b..90225a03b 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/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 + 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"), diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java index 66f704711..b3d8ee521 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/DateAxisValuePane.java +++ b/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{ 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{ private static Map VALUES = new HashMap(); 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{ private static Map INTS = new HashMap(); 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")); diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java index 0c25011e4..0ab62a66c 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/axis/ChartSecondValueNoFormulaPane.java +++ b/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"); } } \ No newline at end of file From 2841506dfb9862b2e1376bfa89b4a57df8d04e3e Mon Sep 17 00:00:00 2001 From: "Wim.Zhai" Date: Tue, 7 Aug 2018 15:10:23 +0800 Subject: [PATCH 11/24] debug --- .../mainframe/chart/gui/style/ChartAxisLineStylePane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index 90225a03b..0746dc20a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -34,7 +34,7 @@ public class ChartAxisLineStylePane extends BasicPane{ axisLineColor = new ColorSelectBox(100); - 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("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"), From 834b7b55ee737f09ca6ea20ef60396865a2a14d5 Mon Sep 17 00:00:00 2001 From: ju Date: Tue, 7 Aug 2018 15:13:33 +0800 Subject: [PATCH 12/24] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20?= =?UTF-8?q?=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mainframe/chart/gui/style/ChartAxisLineStylePane.java | 4 ---- 1 file changed, 4 deletions(-) diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java index e7d31960b..9abf8836a 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLineStylePane.java @@ -33,11 +33,7 @@ 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 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"), From 796e3e5a190a8f87e6b1829004b8e70a0c81ba75 Mon Sep 17 00:00:00 2001 From: "alex.sung" Date: Tue, 7 Aug 2018 15:32:43 +0800 Subject: [PATCH 13/24] =?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 --- .../com/fr/design/actions/help/AboutPane.java | 2 +- .../design/condition/LiteConditionPane.java | 2 +- .../gui/frpane/EditingStringListPane.java | 2 +- .../gui/syntax/ui/rtextarea/RUndoManager.java | 5 +- .../NullBackgroundQuickPane.java | 2 +- .../TextureBackgroundQuickPane.java | 20 ++++---- .../widget/wrappers/BackgroundWrapper.java | 6 +-- .../background/BackgroundPreviewLabel.java | 2 +- .../background/impl/NullBackgroundPane.java | 2 +- .../impl/PatternBackgroundPane.java | 2 +- .../impl/TextureBackgroundPane.java | 50 +++++++++---------- .../background/pattern/PatternSelectPane.java | 2 +- .../background/texture/TextureSelectPane.java | 2 +- .../component/NumberEditorValidatePane.java | 4 +- 14 files changed, 51 insertions(+), 52 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 46aa25450..f508d181a 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -58,7 +58,7 @@ public class AboutPane extends JPanel { BoxCenterAligmentPane boxCenterAlignmentPane = new BoxCenterAligmentPane(getCopyRight()); contentPane.add(boxCenterAlignmentPane); - boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("About-All_Rights_Reserved")); + boxCenterAlignmentPane = new BoxCenterAligmentPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About-All_Rights_Reserved")); contentPane.add(boxCenterAlignmentPane); contentPane.add(new BoxCenterAlignmentCopyablePane( diff --git a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java index f99868485..5b7ee8451 100644 --- a/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/LiteConditionPane.java @@ -124,7 +124,7 @@ public abstract class LiteConditionPane extends BasicBeanPa boolean result = isExistedInParentTreeNode(parentTreeNode, newJoinCondition); if (result) { JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(LiteConditionPane.this), - com.fr.design.i18n.Toolkit.i18nText("BindColumn-This_Condition_has_been_existed")); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BindColumn-This_Condition_has_been_existed")); return; } diff --git a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java index 1acc86d2a..3ca5def0f 100644 --- a/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/frpane/EditingStringListPane.java @@ -129,7 +129,7 @@ public abstract class EditingStringListPane extends BasicBeanPane> setAddEnabled(false); } } else { - JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Already_exists_not_add_repeat")+"!"); + JOptionPane.showMessageDialog(SwingUtilities.getWindowAncestor(EditingStringListPane.this), newvalue + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Already_exists_not_add_repeat")+"!"); } } }); diff --git a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java index c980f848a..a2ae472bf 100644 --- a/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java +++ b/designer-base/src/main/java/com/fr/design/gui/syntax/ui/rtextarea/RUndoManager.java @@ -10,7 +10,6 @@ package com.fr.design.gui.syntax.ui.rtextarea; -import java.util.ResourceBundle; import javax.swing.Action; import javax.swing.UIManager; import javax.swing.event.UndoableEditEvent; @@ -49,8 +48,8 @@ public class RUndoManager extends UndoManager { */ public RUndoManager(RTextArea textArea) { this.textArea = textArea; - cantUndoText = com.fr.design.i18n.Toolkit.i18nText("Action.CantUndo.Name"); - cantRedoText = com.fr.design.i18n.Toolkit.i18nText("Action.CantRedo.Name"); + cantUndoText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action.CantUndo.Name"); + cantRedoText = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action.CantRedo.Name"); } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java index 2ec0aeb58..bdb7a0631 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/NullBackgroundQuickPane.java @@ -48,7 +48,7 @@ public class NullBackgroundQuickPane extends BackgroundQuickPane { * @return 名称 */ public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Background-Null"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Null"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java index 8604fa516..b25fe28b8 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/TextureBackgroundQuickPane.java @@ -150,15 +150,15 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane { TextureBackground.WOVEN_MAT_TEXTURE_PAINT, TextureBackground.WATER_DROPLETS_TEXTURE_PAINT, TextureBackground.PAPER_BAG_TEXTURE_PAINT, TextureBackground.FISH_FOSSIL_TEXTURE_PAINT, TextureBackground.SAND_TEXTURE_PAINT, TextureBackground.CORK_TEXTURE_PAINT, TextureBackground.WALNUT_TEXTURE_PAINT, TextureBackground.OAK_TEXTURE_PAINT, TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT}; - private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"), com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood")}; + private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Newsprint"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-RecycledPaper"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Parchment"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Stationery"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-GreenMarble"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-WhiteMarble"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-BrownMarble"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Granite"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-BlueTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-PinkTissuePaper"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-PurpleMesh"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Bouquet"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Papyrus"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Canvas"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Denim"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-WovenMat"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-WaterDroplets"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-PaperBag"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-FishFossil"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Sand"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Cork"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Walnut"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Oak"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-MediumWood")}; @Override public boolean accept(Background background) { @@ -167,7 +167,7 @@ public class TextureBackgroundQuickPane extends BackgroundQuickPane { @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Texture"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java index 952a0e07e..32634a2fd 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/widget/wrappers/BackgroundWrapper.java @@ -27,15 +27,15 @@ public class BackgroundWrapper implements Encoder, Decoder { if (v instanceof ColorBackground) { return com.fr.design.i18n.Toolkit.i18nText("Color"); } else if (v instanceof TextureBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Texture"); } else if (v instanceof PatternBackground) { - return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Pattern"); } else if (v instanceof ImageFileBackground) { return com.fr.design.i18n.Toolkit.i18nText("Image"); } else if (v instanceof GradientBackground) { return com.fr.design.i18n.Toolkit.i18nText("Gradient-Color"); } else { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_None"); + return com.fr.design.i18n.Toolkit.i18nText("None"); } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java index f859032ed..eb989c3c0 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java +++ b/designer-base/src/main/java/com/fr/design/style/background/BackgroundPreviewLabel.java @@ -38,7 +38,7 @@ public class BackgroundPreviewLabel extends UILabel { this.getSize().getWidth(), this.getSize().getHeight())); this.setText(""); } else { - this.setText(com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "..."); + this.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Background_is_NULL") + "..."); } } diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java index 1c9466f25..376556d8a 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/NullBackgroundPane.java @@ -19,7 +19,7 @@ public class NullBackgroundPane extends BackgroundDetailPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); UILabel centerLabel = new UILabel( - com.fr.design.i18n.Toolkit.i18nText("Background-Background_is_NULL") + "..."); + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Background_is_NULL") + "..."); this.add(centerLabel); centerLabel.setHorizontalAlignment(SwingConstants.CENTER); centerLabel.setBorder(BorderFactory.createLineBorder(GUICoreUtils.getTitleLineBorderColor())); diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java index 19c4bee81..4602cdfb5 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/PatternBackgroundPane.java @@ -45,7 +45,7 @@ public class PatternBackgroundPane extends BPane { } protected String titleOfTypePane() { - return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Pattern"); } protected LayoutManager layoutOfTypePane(int nColumn) { return FRGUIPaneFactory.createNColumnGridLayout(nColumn); diff --git a/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java b/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java index 40b1c5de4..70ca80bb5 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/impl/TextureBackgroundPane.java @@ -47,30 +47,30 @@ public class TextureBackgroundPane extends BPane { TextureBackground.MEDIUM_WOOD_TEXTURE_PAINT}; private static final String[] EMBED_TEXTURE_PAINT_DES_ARRAY = new String[]{ - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Newsprint"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-RecycledPaper"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Parchment"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Stationery"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-GreenMarble"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WhiteMarble"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BrownMarble"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Granite"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-BlueTissuePaper"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PinkTissuePaper"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PurpleMesh"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Bouquet"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Papyrus"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Canvas"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Denim"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WovenMat"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-WaterDroplets"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-PaperBag"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-FishFossil"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Sand"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Cork"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Walnut"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-Oak"), - com.fr.design.i18n.Toolkit.i18nText("BackgroundTexture-MediumWood") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Newsprint"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-RecycledPaper"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Parchment"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Stationery"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-GreenMarble"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-WhiteMarble"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-BrownMarble"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Granite"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-BlueTissuePaper"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-PinkTissuePaper"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-PurpleMesh"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Bouquet"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Papyrus"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Canvas"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Denim"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-WovenMat"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-WaterDroplets"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-PaperBag"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-FishFossil"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Sand"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Cork"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Walnut"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-Oak"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_BackgroundTexture-MediumWood") }; private TexturePaint texturePaint; @@ -89,7 +89,7 @@ public class TextureBackgroundPane extends BPane { } protected String titleOfTypePane() { - return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Texture"); } protected void setChildrenOfTypePane(JPanel typePane2) { ButtonGroup patternButtonGroup = new ButtonGroup(); diff --git a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java index e0b39e2a9..8e4422263 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/pattern/PatternSelectPane.java @@ -28,7 +28,7 @@ public class PatternSelectPane extends BackgroundSelectPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Background-Pattern"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Pattern"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java b/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java index 9081b2c11..86641f838 100644 --- a/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/background/texture/TextureSelectPane.java @@ -27,6 +27,6 @@ public class TextureSelectPane extends BackgroundSelectPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Background-Texture"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background-Texture"); } } \ No newline at end of file diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java index aeba80fe1..2b43ac4a7 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java @@ -53,11 +53,11 @@ public class NumberEditorValidatePane extends JPanel { private void initComponent() { initListeners(); - this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Decimals")); + this.allowDecimalsCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Decimals")); allowDecimalsCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.allowDecimalsCheckBox.addActionListener(allowDecimalsListener); this.decimalLength = new UISpinner(0, Integer.MAX_VALUE, 1, 16); - this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Allow_Negative")); + this.allowNegativeCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Allow_Negative")); this.allowNegativeCheckBox.addActionListener(allowNegativeListener); allowNegativeCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); this.setMaxValueCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Need_Max_Value"), false); From 3317c4604fd85fb064abcf03a4ecad00688a2dcd Mon Sep 17 00:00:00 2001 From: richie Date: Tue, 7 Aug 2018 16:27:09 +0800 Subject: [PATCH 14/24] =?UTF-8?q?CORE-116=20=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E6=8B=86=E5=88=86=E8=AE=BE=E8=AE=A1=E5=99=A8=E3=80=81=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E5=99=A8=E5=92=8Cweb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../fr/design/actions/file/LocalePane.java | 10 +++--- .../main/java/com/fr/design/i18n/Toolkit.java | 31 ++++++++++++------- .../design/chart/ChartDesignerActivator.java | 13 ++++++-- .../mainframe/app/DesignerAppActivator.java | 14 ++++----- .../fr/start/module/DesignerActivator.java | 19 ++++++------ 5 files changed, 54 insertions(+), 33 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java index 64ed36435..2c914bd47 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/LocalePane.java @@ -122,12 +122,14 @@ public class LocalePane extends BasicPane { private void initPredefinedProperties() { Map supportLocaleMap = InterProviderFactory.getProvider().getSupportLocaleMap(); - - Map map; + + // richie:暂时去掉设计器中国际化键值对的显示 + Map map = new HashMap<>(); List sortKeys = new ArrayList(); - - map = InterProviderFactory.getProvider().getLocalBundle(Locale.SIMPLIFIED_CHINESE).getMap(); + + //map = InterProviderFactory.getProvider().getLocalBundle(Locale.SIMPLIFIED_CHINESE).getMap(); + sortKeys.addAll(map.keySet()); Collections.sort(sortKeys); diff --git a/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java b/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java index ad4dff6a4..79bb37bb0 100644 --- a/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java +++ b/designer-base/src/main/java/com/fr/design/i18n/Toolkit.java @@ -1,48 +1,57 @@ package com.fr.design.i18n; +import com.fr.general.GeneralContext; import com.fr.general.log.MessageFormatter; import com.fr.locale.InterProviderFactory; +import com.fr.locale.LocaleManager; +import com.fr.locale.impl.FineLocaleManager; /** * 设计器国际化类，后面会不再依赖InterProviderFactory */ public class Toolkit { + private static LocaleManager localeManager = FineLocaleManager.create(); + + static { + addResource("com/fr/design/i18n/main"); + } + + public static void addResource(String path) { + + localeManager.addResource(path); + } + /** * 设计器国际化方法 + * * @param key 国际化键 * @return 国际化值 */ public static String i18nText(String key) { - return InterProviderFactory.getProvider().getLocText(key); + return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, key); } /** * 带格式化内容的国际化方法 * Toolkit.i18nText("Fine-Design_xxx", 1, 2)，假设Fine-Design_xxx的中文值为：我来计算{}+{}，输出结果为：我来计算1+2 - * @param key 格式化文本 + * + * @param key 格式化文本 * @param args 格式化参数 * @return 国际化值 */ public static String i18nText(String key, Object... args) { String format = InterProviderFactory.getProvider().getLocText(key); MessageFormatter.FormattingTuple tuple = MessageFormatter.arrayFormat(format, args); - return tuple.getMessage(); + return localeManager.getLocalBundle(GeneralContext.getLocale()).getText(localeManager, tuple.getMessage()); } /** * 太鸡儿多了，改不完，先加上慢慢改 + * * @deprecated */ public static String i18nTextArray(String[] keys) { return InterProviderFactory.getProvider().getLocText(keys); } - - /** - * 太鸡儿多了，改不完，先加上慢慢改 - * @deprecated - */ - public static String i18nTextArray(String[] keys, String[] delimiter) { - return InterProviderFactory.getProvider().getLocText(keys, delimiter); - } } diff --git a/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java b/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java index 87ace0b0b..de7e5ec8a 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java +++ b/designer-chart/src/main/java/com/fr/design/chart/ChartDesignerActivator.java @@ -11,7 +11,11 @@ import com.fr.design.module.ChartHyperlinkGroup; import com.fr.design.module.ChartPreStyleAction; import com.fr.design.module.DesignModuleFactory; import com.fr.form.ui.ChartEditor; +import com.fr.locale.InterMutableKey; +import com.fr.locale.LocaleMarker; +import com.fr.locale.LocaleScope; import com.fr.module.Activator; +import com.fr.module.extension.Prepare; import com.fr.plugin.chart.vanchart.imgevent.design.DesignImageEvent; import com.fr.stable.bridge.StableFactory; import com.fr.stable.plugin.ExtraChartDesignClassManagerProvider; @@ -21,7 +25,7 @@ import com.fr.van.chart.map.server.ChartMapEditorAction; /** * Created by juhaoyu on 2018/6/27. */ -public class ChartDesignerActivator extends Activator { +public class ChartDesignerActivator extends Activator implements Prepare { @Override public void start() { @@ -49,7 +53,12 @@ public class ChartDesignerActivator extends Activator { DesignImageEvent.registerDefaultCallbackEvent(HistoryTemplateListPane.getInstance()); DesignImageEvent.registerDownloadSourcesEvent(new DownloadOnlineSourcesHelper()); } - + + @Override + public void prepare() { + addMutable(InterMutableKey.Path, LocaleMarker.create("com/fr/design/i18n/chart", LocaleScope.DESIGN)); + } + @Override public void stop() { diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppActivator.java b/designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppActivator.java index 2d6ebc8a2..f91b0d9a1 100644 --- a/designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppActivator.java +++ b/designer-realize/src/main/java/com/fr/design/mainframe/app/DesignerAppActivator.java @@ -11,29 +11,29 @@ import java.util.List; * Created by juhaoyu on 2018/6/27. */ public class DesignerAppActivator extends Activator implements Prepare { - + @Override public void start() { - + List appList = rightCollectMutable(App.KEY); for (App app : appList) { DesignerFrame.registApp(app); } } - + @Override public void stop() { - + List appList = rightCollectMutable(App.KEY); for (App app : appList) { DesignerFrame.removeApp(app); } } - + @Override public void prepare() { - + addMutable(App.KEY, new CptApp(), new FormApp(), new XlsApp(), new XlsxApp()); - + } } diff --git a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java index 4922f3db4..bac7d7247 100644 --- a/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java +++ b/designer-realize/src/main/java/com/fr/start/module/DesignerActivator.java @@ -27,6 +27,7 @@ import com.fr.design.gui.controlpane.NameObjectCreator; import com.fr.design.gui.controlpane.NameableCreator; import com.fr.design.hyperlink.ReportletHyperlinkPane; import com.fr.design.hyperlink.WebHyperlinkPane; +import com.fr.design.i18n.Toolkit; import com.fr.design.javascript.EmailPane; import com.fr.design.javascript.JavaScriptImplPane; import com.fr.design.javascript.ParameterJavaScriptPane; @@ -58,7 +59,6 @@ import com.fr.design.parameter.WorkBookParameterReader; import com.fr.design.widget.ui.btn.FormSubmitButtonDetailPane; import com.fr.form.stable.ElementCaseThumbnailProcessor; import com.fr.form.ui.WidgetInfoConfig; - import com.fr.general.ModuleContext; import com.fr.general.xml.GeneralXMLTools; import com.fr.js.EmailJavaScript; @@ -67,10 +67,11 @@ import com.fr.js.ParameterJavaScript; import com.fr.js.ReportletHyperlink; import com.fr.js.WebHyperlink; import com.fr.locale.InterMutableKey; +import com.fr.locale.LocaleMarker; +import com.fr.locale.LocaleScope; import com.fr.log.FineLoggerFactory; import com.fr.log.LogHandler; import com.fr.module.Activator; -import com.fr.module.extension.Prepare; import com.fr.quickeditor.cellquick.CellBiasTextPainterEditor; import com.fr.quickeditor.cellquick.CellDSColumnEditor; import com.fr.quickeditor.cellquick.CellFormulaQuickEditor; @@ -114,12 +115,18 @@ import static com.fr.stable.module.Module.ENGINE_MODULE; * 触发原来的DesignerModule的启动 * 之后慢慢将DesignerModule拆成Activator */ -public class DesignerActivator extends Activator implements Prepare { +public class DesignerActivator extends Activator { private LogHandler logHandler = null; @Override public void start() { + List markers = rightCollectMutable(InterMutableKey.Path); + for (LocaleMarker marker : markers) { + if (marker.match(LocaleScope.DESIGN)) { + Toolkit.addResource(marker.getPath()); + } + } designerModuleStart(); preLoadPane(); loadLogAppender(); @@ -403,10 +410,4 @@ public class DesignerActivator extends Activator implements Prepare { unloadLogAppender(); DesignerSocketIO.close(); } - - @Override - public void prepare() { - - addMutable(InterMutableKey.Path, "com/fr/design/i18n/main", "com/fr/design/i18n/chart"); - } } \ No newline at end of file From d901af1d2bb4adadadf95731c500537b5a70f876 Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 7 Aug 2018 17:10:16 +0800 Subject: [PATCH 15/24] . --- .../src/main/java/com/fr/design/DesignerEnvManager.java | 3 +-- .../main/java/com/fr/design/actions/file/SwitchExistEnv.java | 4 ++++ .../java/com/fr/design/env/DesignerWorkspaceGenerator.java | 3 ++- .../src/main/java/com/fr/design/mainframe/TemplatePane.java | 4 ++++ 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java index 60f6cab3c..a03bb3541 100644 --- a/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java +++ b/designer-base/src/main/java/com/fr/design/DesignerEnvManager.java @@ -40,7 +40,6 @@ import com.fr.stable.xml.XMLWriter; import com.fr.stable.xml.XMLableReader; import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; -import com.fr.workspace.connect.AuthException; import javax.swing.*; import javax.swing.SwingWorker.StateValue; @@ -565,7 +564,7 @@ public class DesignerEnvManager implements XMLReadable, XMLWriter { DesignTableDataManager.fireDSChanged(new HashMap()); } }); - } catch (AuthException e) { + } catch (Exception e) { FineLoggerFactory.getLogger().error(e.getMessage(), e); } } diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index cbb21faa0..6a5d4e4b3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -17,6 +17,7 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; +import com.fr.workspace.connect.RemoteDesignVT4FRException; import javax.swing.JOptionPane; import javax.swing.UIManager; @@ -113,6 +114,9 @@ public class SwitchExistEnv extends MenuDef { } catch (AuthException exception) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); + } catch (RemoteDesignVT4FRException e1) { + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), + null, 0, UIManager.getIcon("OptionPane.errorIcon")); } } } diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java index 7b70c957c..cff9f413c 100644 --- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java +++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java @@ -3,6 +3,7 @@ package com.fr.design.env; import com.fr.workspace.WorkContext; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; +import com.fr.workspace.connect.RemoteDesignVT4FRException; import com.fr.workspace.connect.WorkspaceClient; /** @@ -10,7 +11,7 @@ import com.fr.workspace.connect.WorkspaceClient; */ public class DesignerWorkspaceGenerator { - public static Workspace generate(DesignerWorkspaceInfo config) throws AuthException { + public static Workspace generate(DesignerWorkspaceInfo config) throws AuthException, RemoteDesignVT4FRException { if (config == null || config.getType() == null) { return null; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index a3459ad3d..66d25f7bc 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -20,6 +20,7 @@ import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; +import com.fr.workspace.connect.RemoteDesignVT4FRException; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -167,6 +168,9 @@ public class TemplatePane extends JPanel implements MouseListener { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; + } catch (RemoteDesignVT4FRException e) { + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), + null, 0, UIManager.getIcon("OptionPane.errorIcon")); } TemplateTreePane.getInstance().refreshDockingView(); DesignModelAdapter model = DesignModelAdapter.getCurrentModelAdapter(); From a5097256d24d54471ee88d30ec906da6b4d9721a Mon Sep 17 00:00:00 2001 From: hzzz Date: Tue, 7 Aug 2018 17:24:35 +0800 Subject: [PATCH 16/24] . --- .../java/com/fr/design/actions/file/SwitchExistEnv.java | 6 +++++- .../java/com/fr/design/env/DesignerWorkspaceGenerator.java | 2 +- .../main/java/com/fr/design/mainframe/TemplatePane.java | 7 +++++-- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index 6a5d4e4b3..0386937cb 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -13,6 +13,8 @@ import com.fr.design.menu.KeySetUtils; import com.fr.design.menu.MenuDef; import com.fr.design.menu.SeparatorDef; import com.fr.design.utils.DesignUtils; +import com.fr.license.exception.RegistEditionException; +import com.fr.log.FineLoggerFactory; import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; @@ -114,9 +116,11 @@ public class SwitchExistEnv extends MenuDef { } catch (AuthException exception) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); - } catch (RemoteDesignVT4FRException e1) { + } catch (RegistEditionException exception) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); + } catch (Exception exception) { + FineLoggerFactory.getLogger().error(exception.getMessage(), exception); } } } diff --git a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java index cff9f413c..fc5783b10 100644 --- a/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java +++ b/designer-base/src/main/java/com/fr/design/env/DesignerWorkspaceGenerator.java @@ -11,7 +11,7 @@ import com.fr.workspace.connect.WorkspaceClient; */ public class DesignerWorkspaceGenerator { - public static Workspace generate(DesignerWorkspaceInfo config) throws AuthException, RemoteDesignVT4FRException { + public static Workspace generate(DesignerWorkspaceInfo config) throws Exception { if (config == null || config.getType() == null) { return null; diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index 66d25f7bc..8f1a38974 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -15,12 +15,13 @@ import com.fr.design.utils.DesignUtils; import com.fr.env.EnvListPane; import com.fr.general.GeneralContext; import com.fr.general.IOUtils; +import com.fr.license.exception.RegistEditionException; +import com.fr.log.FineLoggerFactory; import com.fr.stable.EnvChangedListener; import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContextCallback; import com.fr.workspace.Workspace; import com.fr.workspace.connect.AuthException; -import com.fr.workspace.connect.RemoteDesignVT4FRException; import javax.swing.BorderFactory; import javax.swing.Icon; @@ -168,9 +169,11 @@ public class TemplatePane extends JPanel implements MouseListener { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; - } catch (RemoteDesignVT4FRException e) { + } catch (RegistEditionException e) { JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Lic_does_not_Support_Remote"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); + } catch (Exception exception) { + FineLoggerFactory.getLogger().error(exception.getMessage(), exception); } TemplateTreePane.getInstance().refreshDockingView(); DesignModelAdapter model = DesignModelAdapter.getCurrentModelAdapter(); From 4add75355b913f6daa58455dee108050d4822f9b Mon Sep 17 00:00:00 2001 From: 3dot141 Date: Tue, 7 Aug 2018 17:25:11 +0800 Subject: [PATCH 17/24] =?UTF-8?q?REPORT-10025=2010.0=20&=205.0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E4=BE=9D=E6=8D=AE=E5=9B=BD=E9=99=85=E5=8C=96=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E8=B0=83=E6=95=B4=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../design/actions/file/SwitchExistEnv.java | 2 +- .../com/fr/design/actions/help/AboutPane.java | 14 ++--- .../help/alphafine/AlphaFineConfigPane.java | 2 +- .../actions/help/alphafine/RemindPane.java | 2 +- .../condition/DSColumnLiteConditionPane.java | 43 ++++++------- .../design/condition/SingleConditionPane.java | 4 +- .../design/data/datapane/EditOrNewLabel.java | 13 ++-- .../data/datapane/TableDataTreePane.java | 2 +- .../tabledatapane/ClassTableDataPane.java | 2 +- .../fr/design/extra/PluginInstalledPane.java | 4 +- .../fr/design/extra/PluginOperateUtils.java | 2 +- .../com/fr/design/extra/PluginWebBridge.java | 2 +- .../com/fr/design/extra/QQLoginWebPane.java | 4 +- .../com/fr/design/extra/WebViewDlgHelper.java | 2 +- .../fr/design/formula/FunctionConstants.java | 2 +- .../gui/controlpane/JListControlPane.java | 14 ++--- .../gui/controlpane/UIListControlPane.java | 14 ++--- .../controlpane/UISimpleListControlPane.java | 2 +- .../gui/iprogressbar/ProgressDialog.java | 2 +- .../itableeditorpane/UITableModelAdapter.java | 19 +++--- .../com/fr/design/gui/style/FRFontPane.java | 11 ++-- .../com/fr/design/gui/style/FormatPane.java | 6 +- .../com/fr/design/mainframe/TemplatePane.java | 2 +- .../ImageBackgroundQuickPane.java | 6 +- .../mainframe/toolbar/ToolBarMenuDock.java | 3 +- .../java/com/fr/design/menu/KeySetUtils.java | 2 +- .../RemoteDesignAuthorityManagerAction.java | 2 +- .../design/remote/ui/AuthorityEditorPane.java | 4 +- .../remote/ui/AuthorityListControlPane.java | 6 +- .../remote/ui/AuthorityManagerPane.java | 2 +- .../design/style/color/ColorSelectPane.java | 4 +- .../style/color/NewColorSelectPane.java | 4 +- .../java/com/fr/design/utils/DesignUtils.java | 2 +- .../write/submit/DBManipulationPane.java | 20 +++--- .../main/java/com/fr/env/RemoteEnvPane.java | 10 +-- .../java/com/fr/file/FILEChooserPane.java | 26 ++++---- .../SeriesCondition/ChartConditionPane.java | 5 +- .../dlp/Bar2DDataLabelPane.java | 4 +- .../impl/ChartHyperPopAttrPane.java | 4 +- .../chart/gui/style/ChartAxisLabelPane.java | 4 +- .../module/ChartEmptyDataStylePane.java | 2 +- .../chart/DownloadOnlineSourcesHelper.java | 6 +- .../format/FormatPaneWithOutFont.java | 2 +- .../background/VanChartAlertValuePane.java | 4 +- .../datasheet/VanChartDataSheetPane.java | 4 +- .../style/StructureNodeStylePane.java | 2 +- .../style/VanChartStructureSeriesPane.java | 2 +- .../layout/FRCardMainBorderLayoutAdapter.java | 4 +- .../fr/design/designer/creator/XPassword.java | 4 +- .../fr/design/designer/creator/XTextArea.java | 4 +- .../design/designer/creator/XTextEditor.java | 4 +- .../creator/cardlayout/TabMoveEndAction.java | 2 +- .../cardlayout/TabMoveFirstAction.java | 2 +- .../creator/cardlayout/TabMoveNextAction.java | 2 +- .../creator/cardlayout/TabMovePrevAction.java | 2 +- ...bsoluteBodyLayoutPropertiesGroupModel.java | 8 +-- .../FRAbsoluteLayoutPropertiesGroupModel.java | 4 +- .../properties/FRFitLayoutConstraints.java | 16 ++--- .../mobile/BodyAppRelayoutTable.java | 6 +- .../fr/design/gui/core/FormWidgetOption.java | 4 +- .../gui/xpane/CardTagLayoutBorderPane.java | 10 +-- .../fr/design/gui/xpane/LayoutBorderPane.java | 62 +++++++++---------- .../com/fr/design/mainframe/CoverPane.java | 4 +- .../com/fr/design/mainframe/FormDesigner.java | 5 +- .../fr/design/mainframe/FormEditToolBar.java | 10 +-- .../design/mainframe/FormParaWidgetPane.java | 6 +- .../mainframe/FormWidgetDetailPane.java | 4 +- .../java/com/fr/design/mainframe/JForm.java | 4 +- .../design/mainframe/WidgetPropertyPane.java | 4 +- .../widget/editors/PaddingMarginPane.java | 29 +++++---- .../parameter/RootDesignDefinePane.java | 6 +- .../ui/designer/CheckBoxDefinePane.java | 4 +- .../ui/designer/DateEditorDefinePane.java | 6 +- .../designer/DirectWriteEditorDefinePane.java | 4 +- .../widget/ui/designer/LabelDefinePane.java | 6 +- .../ui/designer/NumberEditorDefinePane.java | 4 +- .../designer/TextFieldEditorDefinePane.java | 4 +- .../designer/btn/ButtonGroupDefinePane.java | 2 +- .../designer/component/WidgetBoundPane.java | 8 +-- .../component/WidgetCardTagBoundPane.java | 4 +- .../FRAbsoluteBodyLayoutDefinePane.java | 2 +- .../layout/FRAbsoluteLayoutDefinePane.java | 4 +- .../designer/mobile/BodyMobileDefinePane.java | 2 +- .../mobile/ChartEditorDefinePane.java | 4 +- .../mobile/ElementCaseDefinePane.java | 2 +- .../design/actions/cell/EditCellAction.java | 11 ++-- .../cell/style/ReportFontItalicAction.java | 4 +- .../dscolumn/SelectedDataColumnPane.java | 4 +- .../fr/design/headerfooter/HFComponent.java | 44 +++++++------ .../mainframe/CellWidgetPropertyPane.java | 4 +- .../alphafine/component/AlphaFineDialog.java | 4 +- .../alphafine/preview/PluginPreviewPane.java | 2 +- .../design/mainframe/bbs/BBSLoginDialog.java | 26 ++++---- .../fr/design/mainframe/bbs/ExitLabel.java | 4 +- .../design/mainframe/bbs/UserInfoLabel.java | 4 +- .../fr/design/mainframe/bbs/UserInfoPane.java | 4 +- .../cell/settingpane/CellOtherSetPane.java | 4 +- .../mainframe/socketio/DesignerSocketIO.java | 3 +- .../com/fr/design/present/BarCodePane.java | 6 +- .../fr/design/present/CellWriteAttrPane.java | 4 +- .../design/report/ReportBackgroundPane.java | 8 +-- .../fr/design/report/ReportColumnsPane.java | 12 ++-- .../com/fr/design/webattr/EditToolBar.java | 10 +-- .../java/com/fr/design/webattr/EventPane.java | 4 +- .../webattr/ReportSelectToolBarPane.java | 17 +++-- .../fr/design/webattr/ServerPrinterPane.java | 44 +++++++------ .../fr/design/webattr/WriteToolBarPane.java | 4 +- .../design/webattr/WriteWebSettingPane.java | 4 +- .../widget/ui/DateEditorDefinePane.java | 4 +- .../cellquick/CellBiasTextPainterEditor.java | 4 +- .../cellquick/CellImageQuickEditor.java | 4 +- .../cellquick/CellRichTextEditor.java | 4 +- .../cellquick/CellSubReportEditor.java | 4 +- .../start/CollectUserInformationDialog.java | 6 +- 114 files changed, 394 insertions(+), 425 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java index cbb21faa0..91655b399 100644 --- a/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java +++ b/designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java @@ -111,7 +111,7 @@ public class SwitchExistEnv extends MenuDef { } }); } catch (AuthException exception) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); } } diff --git a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java index 46aa25450..9caa20e43 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java @@ -50,8 +50,8 @@ public class AboutPane extends JPanel { getBuildTitle(), GeneralUtils.readFullBuildNO(), new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO_OK") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Build_NO_OK") }); contentPane.add(buildCopyPane); @@ -62,11 +62,11 @@ public class AboutPane extends JPanel { contentPane.add(boxCenterAlignmentPane); contentPane.add(new BoxCenterAlignmentCopyablePane( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Activation_Key"), DesignerEnvManager.getEnvManager().getActivationKey(), new String[]{ - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Activation_Key"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Activation_Key_Copy_OK") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Copy_Activation_Key"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Activation_Key_Copy_OK") })); addPhoneAndQQPane(contentPane); @@ -118,7 +118,7 @@ public class AboutPane extends JPanel { } private JPanel getRemarkPane() { - String remark = com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_About_Remark_Info", PRESIDENT_PHONE); + String remark = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_About_Remark_Info", PRESIDENT_PHONE); UILabel label = new UILabel(); label.setSize(new Dimension(580, 30)); @@ -317,4 +317,4 @@ public class AboutPane extends JPanel { } } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java index cdebcf80b..3669064bd 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java @@ -108,7 +108,7 @@ public class AlphaFineConfigPane extends BasicPane { initFieldListener(); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":")); northPane.add(shortcutsField); - UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-AlphaFine_SetShortcuts")); + UILabel label = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_AlphaFine_SetShortcuts")); label.setForeground(Color.RED); northPane.add(label); contentPane.add(northPane); diff --git a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java index 1213db6c7..7591c2af3 100644 --- a/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java +++ b/designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java @@ -67,7 +67,7 @@ public class RemindPane extends JPanel { } }); - noRemindLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Alphafine_No_Remind")); + noRemindLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Alphafine_No_Remind")); noRemindLabel.setFont(MEDIUM_FONT); noRemindLabel.setForeground(Color.WHITE); checkLabel = new UILabel(); diff --git a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java index e16676d7e..1422202a1 100644 --- a/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java +++ b/designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java @@ -1,41 +1,38 @@ package com.fr.design.condition; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Dimension; - -import javax.swing.DefaultComboBoxModel; - -import com.fr.design.file.HistoryTemplateListPane; -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JList; -import javax.swing.JPanel; -import javax.swing.tree.TreePath; - import com.fr.data.condition.CommonCondition; -import com.fr.design.mainframe.JTemplate; -import com.fr.general.ComparatorUtils; -import com.fr.general.data.Condition; import com.fr.data.condition.JoinCondition; import com.fr.data.core.Compare; import com.fr.design.beans.BasicBeanPane; +import com.fr.design.editor.ValueEditorPane; +import com.fr.design.editor.ValueEditorPaneFactory; +import com.fr.design.editor.editor.ColumnIndexEditor; +import com.fr.design.editor.editor.ColumnNameEditor; +import com.fr.design.editor.editor.Editor; +import com.fr.design.file.HistoryTemplateListPane; import com.fr.design.formula.CustomVariableResolver; import com.fr.design.formula.VariableResolver; import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBoxRenderer; +import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.itree.refreshabletree.ExpandMutableTreeNode; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; -import com.fr.design.editor.ValueEditorPane; -import com.fr.design.editor.ValueEditorPaneFactory; -import com.fr.design.editor.editor.ColumnIndexEditor; -import com.fr.design.editor.editor.ColumnNameEditor; -import com.fr.design.editor.editor.Editor; - +import com.fr.design.mainframe.JTemplate; +import com.fr.general.ComparatorUtils; +import com.fr.general.data.Condition; import com.fr.stable.ArrayUtils; import com.fr.stable.StringUtils; +import javax.swing.DefaultComboBoxModel; +import javax.swing.JList; +import javax.swing.JPanel; +import javax.swing.tree.TreePath; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Dimension; + public class DSColumnLiteConditionPane extends LiteConditionPane { /** * @@ -121,7 +118,7 @@ public class DSColumnLiteConditionPane extends LiteConditionPane extends BasicPane { if(cancel == null) { cancel = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); - cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + cancel.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); cancel.addActionListener(cancleListener); cancel.setMargin(new Insets(0, 0, 0, 0)); } @@ -51,4 +51,4 @@ public abstract class SingleConditionPane extends BasicPane { public abstract void populate(T condition); public abstract T update(); -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java b/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java index 220969b3d..705060eaf 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java @@ -1,12 +1,11 @@ package com.fr.design.data.datapane; -import java.awt.Cursor; - -import com.fr.design.gui.ilable.UILabel; -import javax.swing.JPanel; - import com.fr.base.BaseUtils; import com.fr.design.data.datapane.FlashLookLabelMouseAdapter.ReleaseAction; +import com.fr.design.gui.ilable.UILabel; + +import javax.swing.JPanel; +import java.awt.Cursor; @@ -16,7 +15,7 @@ public class EditOrNewLabel extends UILabel { public EditOrNewLabel(Editable editable, JPanel editPane) { super(BaseUtils.readIcon("/com/fr/design/images/m_file/edit.png")); - this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Edit")); + this.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); this.setCursor(new Cursor(Cursor.HAND_CURSOR)); this.editable = editable; this.editTablePane = editPane; @@ -31,4 +30,4 @@ public class EditOrNewLabel extends UILabel { public static interface Editable { public void edit(JPanel jPanel); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java index 3d5c4d01a..309502e80 100644 --- a/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java +++ b/designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java @@ -84,7 +84,7 @@ public class TableDataTreePane extends BasicTableDataTreePane { ToolTipManager.sharedInstance().registerComponent(dataTree); ToolTipManager.sharedInstance().setDismissDelay(3000); ToolTipManager.sharedInstance().setInitialDelay(0); - addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + addMenuDef = new MenuDef(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH); createAddMenuDef(); diff --git a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java index 9b33532f8..5d8235b94 100644 --- a/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java +++ b/designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java @@ -63,7 +63,7 @@ public class ClassTableDataPane extends AbstractTableDataPane { dlg.setVisible(true); } }); - UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit")); + UIButton editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); editButton.setPreferredSize(new Dimension( editButton.getPreferredSize().width, classNameTextField.getPreferredSize().height)); diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java b/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java index a7a1650c5..1c774669a 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java @@ -124,7 +124,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane { null, new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer_Later"), - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Cancel") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel") }, null ); @@ -155,4 +155,4 @@ public class PluginInstalledPane extends PluginAbstractViewPane { protected String title4PopupWindow() { return "Installed"; } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java index 250a1aca0..e2fc12efe 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java @@ -169,7 +169,7 @@ public class PluginOperateUtils { String username = MarketConfig.getInstance().getBbsUsername(); if (StringUtils.isEmpty(username)) { jsCallback.execute(StringUtils.EMPTY); - uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn")); + uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn")); } else { uiLabel.setText(username); String result = username; diff --git a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java index daa665f25..189b448a7 100644 --- a/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java +++ b/designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java @@ -556,7 +556,7 @@ public class PluginWebBridge { public void clearUserInfo() { MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY); BBSLoginUtils.bbsLogout(); - uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn")); + uiLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn")); } public void getPackInfo(final JSObject callback){ diff --git a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java index dd7e9b915..db7e32e7c 100644 --- a/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java +++ b/designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java @@ -168,7 +168,7 @@ public class QQLoginWebPane extends JFXPanel { new Scene( HBoxBuilder.create().styleClass("modal-dialog").children( LabelBuilder.create().text(msg).build(), - ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Switch-Account")).defaultButton(true).onAction(new EventHandler() { + ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Switch_Account")).defaultButton(true).onAction(new EventHandler() { @Override public void handle(ActionEvent actionEvent) { // take action and close the dialog. @@ -224,4 +224,4 @@ public class QQLoginWebPane extends JFXPanel { } }); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java index 5cf9258ab..084f3fce2 100644 --- a/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java +++ b/designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java @@ -81,7 +81,7 @@ public class WebViewDlgHelper { } else { int rv = JOptionPane.showConfirmDialog( null, - com.fr.design.i18n.Toolkit.i18nText("Fine-Plugin_Shop_Need_Install_Version"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Plugin_Shop_Need_Install_Version"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.INFORMATION_MESSAGE diff --git a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java index 60b4cf5df..74f1953fd 100644 --- a/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java +++ b/designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java @@ -78,7 +78,7 @@ public abstract class FunctionConstants { public static FunctionGroup PLUGIN = new FunctionGroup() { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Base_Formula_Plugin"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Formula_Plugin"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java index 73fccc9e5..fcf7b6786 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java @@ -9,12 +9,10 @@ import com.fr.design.data.tabledata.tabledatapane.GlobalTreeTableDataPane; import com.fr.design.data.tabledata.tabledatapane.MultiTDTableDataPane; import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.design.gui.HyperlinkFilterHelper; -import com.fr.design.gui.NameInspector; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.JNameEdList; import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ModNameActionListener; -import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.menu.LineSeparator; import com.fr.design.menu.MenuDef; @@ -357,7 +355,7 @@ public abstract class JListControlPane extends JControlPane { public AddItemUpdateAction(NameableCreator[] creators) { this.creator = creators[0]; - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -375,7 +373,7 @@ public abstract class JListControlPane extends JControlPane { */ protected class AddItemMenuDef extends MenuDef { public AddItemMenuDef(NameableCreator[] creators) { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setIconPath("/com/fr/design/images/control/addPopup.png"); wrapActionListener(creators); @@ -420,7 +418,7 @@ public abstract class JListControlPane extends JControlPane { */ private class RemoveItemAction extends UpdateAction { public RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/base/images/cell/control/remove.png")); @@ -448,7 +446,7 @@ public abstract class JListControlPane extends JControlPane { */ private class CopyItemAction extends UpdateAction { public CopyItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/m_edit/copy.png")); @@ -547,7 +545,7 @@ public abstract class JListControlPane extends JControlPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); @@ -876,4 +874,4 @@ public abstract class JListControlPane extends JControlPane { protected boolean filterNameableCreator(NameableCreator creator) { return !HyperlinkFilterHelper.whetherAddHyperlink4cell(creator.menuName()); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java index 6f23a0b5c..69cd6d020 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java @@ -15,7 +15,6 @@ import com.fr.design.gui.HyperlinkFilterHelper; import com.fr.design.gui.ibutton.UIButton; import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilist.ListModelElement; -import com.fr.design.gui.ilist.ModNameActionListener; import com.fr.design.gui.ilist.UINameEdList; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.DesignerContext; @@ -29,7 +28,6 @@ import com.fr.general.ComparatorUtils; import com.fr.stable.ArrayUtils; import com.fr.stable.Nameable; import com.fr.stable.StringUtils; -import com.fr.stable.core.PropertyChangeAdapter; import javax.swing.*; import javax.swing.event.ListDataEvent; @@ -387,7 +385,7 @@ public abstract class UIListControlPane extends UIControlPane { public AddItemUpdateAction(NameableCreator[] creators) { this.creator = creators[0]; - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -443,7 +441,7 @@ public abstract class UIListControlPane extends UIControlPane { protected class AddItemMenuDef extends MenuDef { public AddItemMenuDef(NameableCreator[] creators) { super(true); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setIconPath("/com/fr/design/images/control/addPopup.png"); wrapActionListener(creators); @@ -507,7 +505,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class RemoveItemAction extends UpdateAction { public RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/base/images/cell/control/remove.png")); @@ -536,7 +534,7 @@ public abstract class UIListControlPane extends UIControlPane { */ private class CopyItemAction extends UpdateAction { public CopyItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Copy")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Copy")); this.setMnemonic('C'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/m_edit/copy.png")); @@ -635,7 +633,7 @@ public abstract class UIListControlPane extends UIControlPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); @@ -1033,4 +1031,4 @@ public abstract class UIListControlPane extends UIControlPane { nameableList.setSelectedIndex(index); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java index 9c1b65b5d..f5da7e2f8 100644 --- a/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java @@ -292,7 +292,7 @@ public class UISimpleListControlPane extends BasicPane { private boolean isAtoZ = false; public SortItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Sort")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Sort")); this.setMnemonic('S'); this.setSmallIcon(BaseUtils .readIcon("/com/fr/design/images/control/sortAsc.png")); diff --git a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java index 05bf613b6..2247fe453 100644 --- a/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java +++ b/designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java @@ -48,7 +48,7 @@ public class ProgressDialog extends UIDialog { progressBar.setOpaque(false); progressBar.setBorder(null); panel.add(progressBar, BorderLayout.CENTER); - text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Loading_Project"), JLabel.CENTER); + text = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Loading_Project"), JLabel.CENTER); FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334)); text.setFont(font); panel.add(text, BorderLayout.SOUTH); diff --git a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java index c101f1207..b73618fd5 100644 --- a/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java +++ b/designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java @@ -1,10 +1,8 @@ package com.fr.design.gui.itableeditorpane; -import java.awt.Component; -import java.awt.event.ActionEvent; -import java.util.ArrayList; -import java.util.Collections; -import java.util.List; +import com.fr.base.BaseUtils; +import com.fr.base.FRContext; +import com.fr.design.mainframe.DesignerContext; import javax.swing.JOptionPane; import javax.swing.JTable; @@ -12,10 +10,11 @@ import javax.swing.ListSelectionModel; import javax.swing.table.AbstractTableModel; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; - -import com.fr.base.BaseUtils; -import com.fr.base.FRContext; -import com.fr.design.mainframe.DesignerContext; +import java.awt.Component; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; /** @@ -200,7 +199,7 @@ public abstract class UITableModelAdapter extends AbstractTabl protected abstract class EditAction extends UITableEditAction { public EditAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Edit")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png")); } diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java index 3029d31e5..feed40bd3 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java @@ -16,7 +16,6 @@ import com.fr.design.gui.ibutton.UIColorButton; import com.fr.design.gui.ibutton.UIToggleButton; import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.icombobox.UIComboBox; -import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.design.utils.gui.GUICoreUtils; @@ -140,7 +139,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"))) { frFont = frFont.applyStyle(fontSizeStyleComboBox.getSelectedIndex()); } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size"))) { frFont = frFont.applySize(Float.parseFloat(fontSizeComboBox.getSelectedItem().toString())); } if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"))) { @@ -154,7 +153,7 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse } - if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style"))) { + if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style"))) { frFont = frFont.applyUnderline(this.underlineCombo.getSelectedLineStyle()); } @@ -267,12 +266,12 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse private void initAllNames() { fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style")); fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name")); - fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")); + fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")); colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground")); italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic")); bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold")); underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline")); - underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style")); + underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style")); isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough")); isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow")); superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript")); @@ -415,4 +414,4 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF); } } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java index b6fd17778..f32adb937 100644 --- a/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java +++ b/designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java @@ -136,7 +136,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) { return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane}, new Component[]{centerPane, null}, new Component[]{fontPane, frFontPane}, }; @@ -158,7 +158,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs private void iniSampleLable() { Border innterborder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4); Font tmpFont = null; - Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("FR-Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR); + Border border = BorderFactory.createTitledBorder(innterborder, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample"), TitledBorder.LEFT, 0, tmpFont, UIConstants.LINE_COLOR); sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) { @Override @@ -432,4 +432,4 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs public void setGlobalName(String name) { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java index a3459ad3d..d79daf371 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java @@ -164,7 +164,7 @@ public class TemplatePane extends JPanel implements MouseListener { } setJLabel(selectedName); } catch (AuthException e) { - JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed"), + JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed"), null, 0, UIManager.getIcon("OptionPane.errorIcon")); return false; } diff --git a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java index 7f47fbae8..fcc1f5360 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java @@ -45,7 +45,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { public ImageBackgroundQuickPane(boolean hasImageLayout) { this.setLayout(new BorderLayout(0, 4)); - String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Default"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Titled"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image_Adjust")}; + String[] nameArray = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Default"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Titled"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Extend"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image_Adjust")}; Byte[] valueArray = {Constants.IMAGE_CENTER, Constants.IMAGE_TILED, Constants.IMAGE_EXTEND, Constants.IMAGE_ADJUST}; imageLayoutPane = new UIButtonGroup(nameArray, valueArray); imageLayoutPane.setSelectedIndex(0); @@ -174,7 +174,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { */ @Override public String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Background_Image"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Background_Image"); } @Override @@ -182,4 +182,4 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane { imageLayoutPane.setSelectedIndex(0); previewPane.setImage(null); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java index c5005c953..f75b9c196 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java @@ -3,7 +3,6 @@ */ package com.fr.design.mainframe.toolbar; -import com.fr.base.BaseUtils; import com.fr.base.FRContext; import com.fr.base.vcs.DesignerMode; import com.fr.design.DesignState; @@ -564,7 +563,7 @@ public abstract class ToolBarMenuDock { }; UILabel uiLabel = new UILabel(text); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); - uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-All_MSBold"), 0, 14)); + uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_MSBold"), 0, 14)); uiLabel.setForeground(new Color(150, 150, 150)); panel.add(uiLabel, BorderLayout.CENTER); return panel; diff --git a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java index 32436be62..15c03e320 100644 --- a/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java +++ b/designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java @@ -536,7 +536,7 @@ public class KeySetUtils { @Override public String getMenuName() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Report_Background"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Background"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java index 05775c4de..ceebd0c01 100644 --- a/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java +++ b/designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java @@ -21,7 +21,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction { public RemoteDesignAuthorityManagerAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager")); this.setSmallIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png")); } diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java index 991aadbd5..cf81ba5d4 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java @@ -31,7 +31,7 @@ public class AuthorityEditorPane extends BasicBeanPane { BorderFactory.createCompoundBorder( new EmptyBorder(6, 0, 6, 6), UITitledBorder.createBorderWithTitle( - com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Template_Authority_Config") + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Template_Authority_Config") ) ) ); @@ -45,7 +45,7 @@ public class AuthorityEditorPane extends BasicBeanPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Configure_Authority"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Configure_Authority"); } @Override diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java index db94bea69..f917e9219 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java @@ -78,7 +78,7 @@ public class AuthorityListControlPane extends BasicPane { this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.authorityCreators = new RemoteDesignAuthorityCreator[]{ new RemoteDesignAuthorityCreator( - com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_User"), + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_User"), BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"), DesignAuthority.class, AuthorityEditorPane.class) @@ -470,7 +470,7 @@ public class AuthorityListControlPane extends BasicPane { private class AddItemUpdateAction extends UpdateAction { AddItemUpdateAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Add")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Add")); this.setMnemonic('A'); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); } @@ -511,7 +511,7 @@ public class AuthorityListControlPane extends BasicPane { */ private class RemoveItemAction extends UpdateAction { RemoveItemAction() { - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Action_Remove")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Action_Remove")); this.setMnemonic('R'); this.setSmallIcon(BaseUtils .readIcon(IconPathConstants.TD_REMOVE_ICON_PATH)); diff --git a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java index 8cc139cc3..f84bff5c9 100644 --- a/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java +++ b/designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java @@ -23,7 +23,7 @@ public class AuthorityManagerPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Remote_Design_Authority_Manager"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Design_Authority_Manager"); } public void populate(DesignAuthority[] authorities) { diff --git a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java index d0e7eac2a..a0dd8fb55 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java @@ -80,7 +80,7 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable centerPane.add(Box.createVerticalStrut(1)); - UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color")); + UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color")); customButton.addMouseListener(new MouseAdapter() { @Override @@ -198,4 +198,4 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable pane = new ColorSelectDetailPane(Color.WHITE); ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this); } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java index 88d4f76f0..dcb6119f3 100644 --- a/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java +++ b/designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java @@ -94,7 +94,7 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { centerPane.add(Box.createVerticalStrut(1)); // mod by anchore 16/11/16 - UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_More_Color")); + UIButton customButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_More_Color")); customButton.addMouseListener(new MouseAdapter() { @Override @@ -203,4 +203,4 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable { } -} \ No newline at end of file +} diff --git a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java index 497dd07e0..d0d0b859d 100644 --- a/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java +++ b/designer-base/src/main/java/com/fr/design/utils/DesignUtils.java @@ -237,7 +237,7 @@ public class DesignUtils { //比如想在中文或英文系统里用韩文设计器 guiFRFont = getNamedFont("Dialog"); if (!guiFRFont.canDisplay(displayChar)) { - FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("FR-Base_SimSun_Not_Found")); + FRContext.getLogger().error(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_SimSun_Not_Found")); } } } diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 7476ca241..48e0e025d 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -134,7 +134,7 @@ public class DBManipulationPane extends BasicBeanPane { northPane.add(typePane, BorderLayout.NORTH); chooseTable = new ChoosePaneSupportFormula(); - chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Table"))); + chooseTable.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Table"))); chooseTable.setTableNameComboBoxPopSize(160, 320); northPane.add(chooseTable, BorderLayout.CENTER); @@ -142,7 +142,7 @@ public class DBManipulationPane extends BasicBeanPane { // peter:编辑的TablePane JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); this.add(editTablePane, BorderLayout.CENTER); - editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value"))); + editTablePane.setBorder(BorderFactory.createTitledBorder(new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"))); keyColumnValuesTable = new KeyColumnNameValueTable(); editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER); @@ -183,11 +183,11 @@ public class DBManipulationPane extends BasicBeanPane { UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("RWA-NotChange_Unmodified")); UIButton helpButton = new UIButton(HEIP_ICON); - helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help")); + helpButton.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help")); helpButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f); + FormatExplanationPane formatExplanation = new FormatExplanationPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Help"),com.fr.design.i18n.Toolkit.i18nText("FR-Designer_RWA-Help"), 12f); BasicDialog dlg = formatExplanation.showMediumWindow(SwingUtilities.getWindowAncestor(DBManipulationPane.this), new DialogActionAdapter(){}); dlg.setVisible(true); @@ -309,7 +309,7 @@ public class DBManipulationPane extends BasicBeanPane { protected void setBorderAndLayout(JPanel jPanel){ jPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); jPanel.setBorder(BorderFactory.createTitledBorder( - new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Submit_Condition"))); + new ModLineBorder(ModLineBorder.TOP), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Submit_Condition"))); } protected void addComponent(JPanel mainPane,JScrollPane addPane){ @@ -475,7 +475,7 @@ public class DBManipulationPane extends BasicBeanPane { } for (int j = 0; j < keyColumnNameValueList.size(); j++) { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { - Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("FR-Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; + Object[] options = { com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Covered_All"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Yes"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_No"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Cover_None") }; returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name), "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]); @@ -580,7 +580,7 @@ public class DBManipulationPane extends BasicBeanPane { } int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this), - com.fr.design.i18n.Toolkit.i18nText("FR-Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("FR-Base_Remove"), JOptionPane.OK_CANCEL_OPTION, + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_sure_remove_item") + "?", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Remove"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.QUESTION_MESSAGE); if (returnVal == JOptionPane.OK_OPTION) { KeyColumnTableModel keyColumnNameValueTableModel = (KeyColumnTableModel)keyColumnValuesTable.getModel(); @@ -944,9 +944,9 @@ public class DBManipulationPane extends BasicBeanPane { } protected abstract static class KeyColumnTableModel extends AbstractTableModel { - public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("FR-Base_RWA-Key"); - public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Column"); - public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("FR-Base_Value"); + public static final String RAW_KEY = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_RWA-Key"); + public static final String COLUMN = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Column"); + public static final String VALUE = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Base_Value"); public static final String[] COLUMN_NAMES = new String[]{RAW_KEY, COLUMN, VALUE}; diff --git a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java index 4cf96c2b4..408dc6c5d 100644 --- a/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java +++ b/designer-base/src/main/java/com/fr/env/RemoteEnvPane.java @@ -534,20 +534,20 @@ public class RemoteEnvPane extends BasicBeanPane { try { Boolean result = get(); if (result == null) { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Auth_Failed")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Auth_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } else { if (result) { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Successful")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Successful")); uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon")); } else { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } } } catch (InterruptedException | ExecutionException e) { FineLoggerFactory.getLogger().error(e, e.getMessage()); - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Connect_Failed")); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Connect_Failed")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon")); } dialogDownPane.remove(cancelButton); @@ -583,7 +583,7 @@ public class RemoteEnvPane extends BasicBeanPane { } private void initMessageDialog() { - message.setText(Toolkit.i18nText("Fine-Designer_Basic_Remote_Env_Try") + "..."); + message.setText(Toolkit.i18nText("Fine-Design_Basic_Remote_Env_Try") + "..."); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0)); okButton.setEnabled(false); diff --git a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java index f69ed1177..e5ae775a8 100644 --- a/designer-base/src/main/java/com/fr/file/FILEChooserPane.java +++ b/designer-base/src/main/java/com/fr/file/FILEChooserPane.java @@ -255,7 +255,7 @@ public class FILEChooserPane extends BasicPane { centerRightPane.add(fileNamePane, BorderLayout.SOUTH); Component[][] outComponents = new Component[][]{ - new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Lookup_range") + ":"), BorderLayout.WEST), locationPane}, + new Component[]{GUICoreUtils.createBorderPane(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Lookup_range") + ":"), BorderLayout.WEST), locationPane}, new Component[]{centerLeftPanel, centerRightPane}}; JPanel contentPane = TableLayoutHelper.createTableLayoutPane(outComponents, new double[]{TableLayout.PREFERRED, TableLayout.FILL}, new double[]{TableLayout.PREFERRED, TableLayout.FILL}); @@ -546,19 +546,19 @@ public class FILEChooserPane extends BasicPane { EnumSet fileExtensions = EnumSet.of(FileExtension.CPT, FileExtension.CPTX, FileExtension.FRM, FileExtension.FRMX, FileExtension.CHT); if (type == JFileChooser.OPEN_DIALOG) { if (WorkContext.getCurrent().isLocal()) { //本地连接 - this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(fileSuffix_local, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); } else { - this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(fileExtensions, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); } } // ben:filefilter设置初值为cpt过滤 - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPT, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); // richer:form文件 daniel 改成三个字 - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRM, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File"))); } else { if (type == JFileChooser.OPEN_DIALOG) { this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), com.fr.design.i18n.Toolkit.i18nText("Import-Excel_Source"))); @@ -571,7 +571,7 @@ public class FILEChooserPane extends BasicPane { this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, com.fr.design.i18n.Toolkit.i18nText("Import-Excel2007_Source"))); } if (FileExtension.PNG.matchExtension(suffix)) { - this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("FR-App-Export_png"))); + this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PNG, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Export_png"))); } if (type == JFileChooser.SAVE_DIALOG) { this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PDF, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_PDF"))); @@ -647,7 +647,7 @@ public class FILEChooserPane extends BasicPane { saveDictionary(); dialogExit(); } else { - JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Report_Not_Exist")); + JOptionPane.showMessageDialog(this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Report_Not_Exist")); return; } } @@ -688,7 +688,7 @@ public class FILEChooserPane extends BasicPane { FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE); return; } if (selectedFile.exists()) { @@ -741,7 +741,7 @@ public class FILEChooserPane extends BasicPane { * dialog的名字 */ private String dialogName() { - return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("FR-App-Template_Save"); + return type == JFileChooser.OPEN_DIALOG ? com.fr.design.i18n.Toolkit.i18nText("Utils-Design-File_Open") : com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Template_Save"); } /* @@ -1406,7 +1406,7 @@ public class FILEChooserPane extends BasicPane { FineLoggerFactory.getLogger().error(e.getMessage(), e); } if (!access) { - JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("FR-App-Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("FR-App-File_Message"), JOptionPane.WARNING_MESSAGE); + JOptionPane.showMessageDialog(FILEChooserPane.this, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_Privilege_No") + "!", com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_App_File_Message"), JOptionPane.WARNING_MESSAGE); return; } @@ -1448,4 +1448,4 @@ public class FILEChooserPane extends BasicPane { folderButton.addActionListener(createFolderActionListener); return folderButton; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java index d08478a4b..af44b6331 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java @@ -16,7 +16,6 @@ import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayoutHelper; import com.fr.general.ComparatorUtils; -import com.fr.general.Inter; import com.fr.plugin.chart.type.ConditionKeyType; import com.fr.stable.StringUtils; @@ -84,7 +83,7 @@ public class ChartConditionPane extends LiteConditionPane { conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height)); conditionOPComboBox.setPreferredSize(new Dimension(80, 20)); Component[][] components = { - {new UILabel(Inter.getLocText("Utils-Available_Columns") + ":"), new UILabel(Inter.getLocText("FR-ConditionB_Operator") + ":"), + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Utils_Available_Columns") + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_ConditionB_Operator") + ":"), new UILabel()}, {conditionKeyComboBox, conditionOPComboBox, conditionValuePane}}; double p = TableLayout.PREFERRED; @@ -147,4 +146,4 @@ public class ChartConditionPane extends LiteConditionPane { } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java index 6e20d8099..62893fd14 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java @@ -25,7 +25,7 @@ public class Bar2DDataLabelPane extends DataLabelPane { private UIRadioButton outSideButton; protected JPanel createJPanel4Position() { - centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center")); + centerButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_StyleAlignment_Center")); insideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelInside")); outSideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelOutSide")); @@ -67,4 +67,4 @@ public class Bar2DDataLabelPane extends DataLabelPane { seriesAttrContents.setPosition(Constants.OUTSIDE); } } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java index 2399a9ec8..80f78c273 100644 --- a/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java +++ b/designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java @@ -71,7 +71,7 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { double[] rowSize = { p,p,p,p,p,p}; Component[][] components = new Component[][]{ - new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title") + ":", SwingConstants.RIGHT), titleField}, + new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title") + ":", SwingConstants.RIGHT), titleField}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Width") + ":", SwingConstants.RIGHT), widthField}, new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ":", SwingConstants.RIGHT), heightField}, }; @@ -150,4 +150,4 @@ public class ChartHyperPopAttrPane extends AbstractChartAttrPane { return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink"); } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java index 92b268d97..00d7ecce8 100644 --- a/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java +++ b/designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java @@ -92,7 +92,7 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ orientationBar = new NumberDragBar(-NUM90, NUM90); orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1)); - String[] sampleType = {com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Auto"), com.fr.design.i18n.Toolkit.i18nText("FR-App-All_Custom")}; + String[] sampleType = {com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_App_All_Auto"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_App_All_Custom")}; labelSampleChoose = new UIComboBox(sampleType); customLabelSamleTime = new UITextField(); checkCustomSampleField(); @@ -466,4 +466,4 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{ public boolean shouldResponseChangeListener() { return true; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java index c7dbea42e..310455339 100644 --- a/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java +++ b/designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java @@ -117,7 +117,7 @@ public class ChartEmptyDataStylePane extends AbstractAttrNoScrollPane { selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY)); defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); - customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Custom")); + customRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom")); ButtonGroup buttonGroup = new ButtonGroup(); defaultRadioButton.setSelected(true); buttonGroup.add(defaultRadioButton); diff --git a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java index 03b51d750..79a1acdd1 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java +++ b/designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java @@ -79,7 +79,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { public void installOnline() { - int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION); + int choose = JOptionPane.showConfirmDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Download_Online_Sources"), null, JOptionPane.YES_NO_OPTION); if (choose == JOptionPane.OK_OPTION) { initDialog(); @@ -174,7 +174,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { setProgress(0); dialog = new JDialog(); - dialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Online")); + dialog.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Dependence_Install_Online")); JPanel contentPane = new JPanel(new BorderLayout()); contentPane.add(label, BorderLayout.CENTER); @@ -208,7 +208,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent { RestartHelper.restart(); } } else { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Dependence_Install_Failed")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Dependence_Install_Failed")); } } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java index 23159b40a..7275ad074 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java @@ -32,7 +32,7 @@ public class FormatPaneWithOutFont extends FormatPane { typePane.setBorder(BorderFactory.createEmptyBorder()); return new Component[][]{ new Component[]{null, null}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"), SwingConstants.LEFT), typePane}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"), SwingConstants.LEFT), typePane}, new Component[]{null, centerPane}, }; } diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java index 4f5dff062..2821564bf 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java @@ -119,7 +119,7 @@ public class VanChartAlertValuePane extends BasicBeanPane { new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Content")),alertText}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font")),fontName}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")),fontSize}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")),fontSize}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor}, }; @@ -200,4 +200,4 @@ public class VanChartAlertValuePane extends BasicBeanPane { } return chartAlertValue; } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java b/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java index 49b69f00f..bb8aa4e4a 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java @@ -94,7 +94,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane { double[] columnSize = {d, e}; double[] rowSize = {p,p,p}; Component[][] components = new Component[][]{ - new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Format"),formatPane),null}, + new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_Format"),formatPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"),textAttrPane),null}, new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),null}, }; @@ -185,4 +185,4 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane { } -} \ No newline at end of file +} diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java index 3f8bdafb0..610c616d9 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java @@ -58,7 +58,7 @@ public class StructureNodeStylePane extends BasicBeanPane { new Component[]{null, null}, new Component[]{jPanel, null}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border_Width")), nodeBorderWidth}, - new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), nodeBorderColor}, + new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), nodeBorderColor}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), nodeOpacity} }; diff --git a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java index 231ceb7c2..1f53dd071 100644 --- a/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java +++ b/designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java @@ -76,7 +76,7 @@ public class VanChartStructureSeriesPane extends VanChartAbstractPlotSeriesPane double[] rowSize = {p,p,p,p}; JPanel jPanel = new JPanel(new BorderLayout()); - jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width")+" ", linkWidthType), BorderLayout.NORTH); + jPanel.add(TableLayout4VanChartHelper.createGapTableLayoutPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width")+" ", linkWidthType), BorderLayout.NORTH); linkWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(" ", linkWidth); jPanel.add(linkWidthPane, BorderLayout.CENTER); diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java index 123130fc4..1d529743a 100644 --- a/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java +++ b/designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java @@ -47,13 +47,13 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter { if (ComparatorUtils.equals(constraints, BorderLayout.NORTH) || ComparatorUtils.equals(constraints, BorderLayout.SOUTH)) { int containerHeight = container.getHeight(); if (rectangle.height > containerHeight) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Tablayout_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds")); return true; } } else if (ComparatorUtils.equals(constraints, BorderLayout.EAST) || ComparatorUtils.equals(constraints, BorderLayout.WEST)) { int containerWidth = container.getWidth(); if (rectangle.width > containerWidth) { - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Tablayout_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds")); return true; } } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java index d106c13bb..6a76b0325 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java @@ -51,7 +51,7 @@ public class XPassword extends XWrapperedFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")} , super.supportedDescriptor()); CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( @@ -70,4 +70,4 @@ public class XPassword extends XWrapperedFieldEditor { (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark}); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java index cb21759e2..624b32ece 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java @@ -39,7 +39,7 @@ public class XTextArea extends XFieldEditor { CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll( new CRPropertyDescriptor[]{ new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}, super.supportedDescriptor()); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) @@ -83,4 +83,4 @@ public class XTextArea extends XFieldEditor { protected String getIconName() { return "text_area_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java b/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java index 85ae88f29..43a8b87d1 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java @@ -42,7 +42,7 @@ public class XTextEditor extends XWrapperedFieldEditor { @Override public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( - com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")).setEditorClass( + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")).setEditorClass( WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced"); CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( @@ -84,4 +84,4 @@ public class XTextEditor extends XWrapperedFieldEditor { return "text_field_16.png"; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java index db2a96f9b..55f303835 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java @@ -13,7 +13,7 @@ public class TabMoveEndAction extends TabMoveAction { public TabMoveEndAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_End")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_End")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/end.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java index f19326722..b98453e0b 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java @@ -13,7 +13,7 @@ public class TabMoveFirstAction extends TabMoveAction { public TabMoveFirstAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_First")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_First")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/first.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java index 67f378455..6dfae2ddd 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java @@ -13,7 +13,7 @@ public class TabMoveNextAction extends TabMoveAction { public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_Next")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_Next")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/next.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java index 1ddcb9b2c..c36868039 100644 --- a/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java +++ b/designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java @@ -13,7 +13,7 @@ public class TabMovePrevAction extends TabMoveAction { public TabMovePrevAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) { super(t, xCardSwitchButton); - this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Move_Tab_Prev")); + this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Move_Tab_Prev")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/prev.png")); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java index e6516a486..2e395eae3 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java @@ -2,22 +2,16 @@ package com.fr.design.designer.properties; import com.fr.design.designer.creator.*; import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; -import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.FormDesigner; -import com.fr.design.mainframe.FormSelectionUtils; import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.widget.editors.LayoutTypeEditor; -import com.fr.design.utils.gui.LayoutUtils; -import com.fr.form.ui.Widget; import com.fr.form.ui.container.WBodyLayoutType; import com.fr.log.FineLoggerFactory; -import com.fr.general.FRScreen; import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import java.awt.*; -import java.awt.geom.Arc2D; import java.util.Arrays; import java.util.Comparator; @@ -73,7 +67,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr case 0: return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode"); } } else { switch (row) { diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java index df5e47c61..2aec61be2 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java @@ -38,7 +38,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { */ @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Area_Scaling"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormWidget_Area_Scaling"); } @Override @@ -59,7 +59,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel { @Override public Object getValue(int row, int column) { if (column == 0) { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode"); } else { return layout.getCompState(); } diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java index 4235035bd..7e2fd9451 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java @@ -47,7 +47,7 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { @Override public String getGroupName() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Size"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Size"); } @Override @@ -70,9 +70,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { if (column == 0) { switch (row) { case 0: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"); default: - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"); } } else { switch (row) { @@ -101,9 +101,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return false; } if(bounds.width == rec.width - margin.getLeft() - margin.getRight()){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Bounds")); }else if(v < minWidth){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Min_Width") + Integer.toString(minWidth)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Width") + Integer.toString(minWidth)); v = xCreator.getWidth(); } difference = bounds.width - v; @@ -114,9 +114,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return false; } if(bounds.height == rec.height - margin.getTop() - margin.getBottom()){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Beyond_Bounds")); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Bounds")); }else if(v < minHeight){ - JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Min_Height") + Integer.toString(minHeight)); + JOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Min_Height") + Integer.toString(minHeight)); v = xCreator.getHeight(); } difference = bounds.height - v; @@ -158,4 +158,4 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel { return true; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java index d423e17b1..7e1b8feab 100644 --- a/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java +++ b/designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java @@ -1,6 +1,5 @@ package com.fr.design.designer.properties.mobile; -import java.awt.*; import java.awt.event.MouseEvent; import java.beans.IntrospectionException; import java.util.ArrayList; @@ -8,7 +7,6 @@ import java.util.ArrayList; import com.fr.base.FRContext; import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.creator.*; -import com.fr.design.form.util.XCreatorConstants; import com.fr.design.gui.itable.AbstractPropertyTable; import com.fr.design.gui.itable.PropertyGroup; import com.fr.design.gui.xtable.ReportAppPropertyGroupModel; @@ -32,7 +30,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { CRPropertyDescriptor[] propertyTableEditor = { new CRPropertyDescriptor("appRelayout", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) - .setI18NName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-App_ReLayout")) + .setI18NName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_App_ReLayout")) }; return propertyTableEditor; } @@ -85,4 +83,4 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable { public void firePropertyEdit() { designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java index d1d8cfbf0..94a21d192 100644 --- a/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java +++ b/designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java @@ -89,7 +89,7 @@ public class FormWidgetOption extends WidgetOption { public static final WidgetOption VERTICALBOXLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_VerticalBoxLayout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WVerticalBoxLayout.class); - public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Layout_Adaptive_Layout"), + public static final WidgetOption FITLAYOUTCONTAINER = WidgetOptionFactory.createByWidgetClass(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout_Adaptive_Layout"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"), WFitLayout.class); @@ -98,4 +98,4 @@ public class FormWidgetOption extends WidgetOption { public static final WidgetOption ELEMENTCASE = WidgetOptionFactory.createByWidgetClass(Toolkit.i18nText("FR-Designer_Form-Report"), BaseUtils.readIcon("/com/fr/design/images/buttonicon/report_16.png"), ElementCaseEditor.class); -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java index b9abdae75..fd0507c81 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java @@ -45,13 +45,13 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { double[] columnSize = { p, f}; JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontSizeTypePane}, {new UILabel(""), initFontButtonPane()}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Background")), this.getTitleBackgroundPane()}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), this.getTitleBackgroundPane()}, }, rowSize, columnSize, 10); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); this.setTitlePane(new UIScrollPane(rightBottomContentPane)); - this.getTitlePane().setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title"),null)); + this.getTitlePane().setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title"),null)); this.getTitlePane().setVisible(false); return this.getTitlePane(); } @@ -66,7 +66,7 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); defaultPane.add(centerPane, BorderLayout.CENTER); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Preview"), null)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); centerPane.add(borderPane, BorderLayout.CENTER); @@ -112,4 +112,4 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane { protected void populateTitle(){ return; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java index 0945a2259..5f517c3d4 100644 --- a/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java +++ b/designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java @@ -317,8 +317,8 @@ public class LayoutBorderPane extends BasicPane { Constants.LINE_THICK, //3px }; - public final static String[] BORDER_TYPE = new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Standard"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Custom")}; - public final static String[] BORDER_STYLE= new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Common"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Shadow")}; + public final static String[] BORDER_TYPE = new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Standard"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Custom")}; + public final static String[] BORDER_STYLE= new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Common"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Shadow")}; private final static Dimension BUTTON_SIZE = new Dimension(24, 20); @@ -335,7 +335,7 @@ public class LayoutBorderPane extends BasicPane { JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); defaultPane.add(centerPane, BorderLayout.CENTER); - centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Preview"), null)); + centerPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Preview"), null)); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); centerPane.add(borderPane, BorderLayout.CENTER); @@ -381,23 +381,23 @@ public class LayoutBorderPane extends BasicPane { double[] columnSize = { p, MAX_WIDTH}; JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ getBorderTypeComp(), - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Render_Style")), borderStyleCombo}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Line")), currentLineCombo}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Border_Color")), buttonPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Render_Style")), borderStyleCombo}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Line")), currentLineCombo}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Border_Color")), buttonPane}, getBorderCornerSpinnerComp(), - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, - {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Alpha"))}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Background")), backgroundPane}, + {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))}, {new UILabel(""),transparencyPane}, }, rowSize, columnSize, 10); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); UIScrollPane rightTopPane = new UIScrollPane(rightTopContentPane); - rightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame"),null)); + rightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame"),null)); rightTopPane.setPreferredSize(rightTopPane.getPreferredSize()); return rightTopPane; } protected JComponent[] getBorderTypeComp(){ - return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame_Style")), borderTypeCombo}; + return new JComponent[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame_Style")), borderTypeCombo}; } protected JComponent[] getBorderCornerSpinnerComp(){ @@ -438,14 +438,14 @@ public class LayoutBorderPane extends BasicPane { double[] rowSize = {p,p,p}; double[] columnSize = { p, f}; JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, - {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Alpha"))}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Body_Background")), backgroundPane}, + {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))}, {new UILabel(""),transparencyPane}, }, rowSize, columnSize, 10); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 6)); JPanel bodyRightTopPane =FRGUIPaneFactory.createBorderLayout_S_Pane(); bodyRightTopPane.add(rightTopContentPane,BorderLayout.CENTER); - bodyRightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Frame"),null)); + bodyRightTopPane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Frame"),null)); return bodyRightTopPane; } @@ -463,8 +463,8 @@ public class LayoutBorderPane extends BasicPane { BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") - , com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0)); hPaneContainer.add(hAlignmentPane); @@ -475,15 +475,15 @@ public class LayoutBorderPane extends BasicPane { double[] columnSize = { p, MAX_WIDTH}; JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Content")), formulaPane}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Format")), fontSizeTypePane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Content")), formulaPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Format")), fontSizeTypePane}, {new UILabel(""), initFontButtonPane()}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Alignment-Style")), hPaneContainer}, - {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title_Background")), titleBackgroundPane}, + {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title_Background")), titleBackgroundPane}, }, rowSize, columnSize, 10); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); titlePane =new UIScrollPane(rightBottomContentPane); - titlePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Title"),null)); + titlePane.setBorder(GUICoreUtils.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Style_Title"),null)); titlePane.setVisible(false); return titlePane; } @@ -520,20 +520,20 @@ public class LayoutBorderPane extends BasicPane { } protected void initAllNames() { - fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Family")); - fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Size")); - colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Foreground")); - italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); - bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); - underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); - underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Line_Style")); + fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Family")); + fontSizeComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Size")); + colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground")); + italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic")); + bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold")); + underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline")); + underlineCombo.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Line_Style")); } protected void setToolTips() { - colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Foreground")); - italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); - bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); - underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); + colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground")); + italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic")); + bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold")); + underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Underline")); } @@ -931,4 +931,4 @@ public class LayoutBorderPane extends BasicPane { protected String title4PopupWindow() { return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java b/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java index 4b4d94b10..d692eaa5e 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java @@ -42,7 +42,7 @@ public class CoverPane extends JPanel { setBackground(null); setOpaque(false); - editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Edit"), IOUtils.readIcon(IconPathConstants.EDIT_ICON_PATH)) { + editButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"), IOUtils.readIcon(IconPathConstants.EDIT_ICON_PATH)) { @Override public Dimension getPreferredSize() { return new Dimension(60, 24); @@ -130,4 +130,4 @@ public class CoverPane extends JPanel { protected Rectangle getPaintBorderBounds(){ return new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2 , getHeight() - BORDER_WIDTH * 2); } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 56579a1a3..06fcd72ef 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -1,6 +1,5 @@ package com.fr.design.mainframe; -import com.fr.base.BaseUtils; import com.fr.base.Parameter; import com.fr.base.ScreenResolution; import com.fr.base.vcs.DesignerMode; @@ -358,7 +357,7 @@ public class FormDesigner extends TargetComponent
implements TreeSelection } private void addParaPaneTooltips() { - JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-Please_Drag_ParaPane"), + JOptionPane.showConfirmDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Please_Drag_ParaPane"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Tooltips"), JOptionPane.OK_CANCEL_OPTION, JOptionPane.WARNING_MESSAGE); } @@ -1490,4 +1489,4 @@ public class FormDesigner extends TargetComponent implements TreeSelection public int getResolution(){ return this.resolution; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java index 56377a93e..3f90e0569 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java @@ -125,12 +125,12 @@ public class FormEditToolBar extends BasicPane { this.add(splitPane); list.addListSelectionListener(listSelectionListener); JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); - UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Background_Set")); - defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Default_Background")); + UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Background_Set")); + defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Default_Background")); bgButton.addActionListener(actioner); backgroundPane.add(defaultCheckBox); backgroundPane.add(bgButton); - backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Background_Set"))); + backgroundPane.setBorder(BorderFactory.createTitledBorder(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Background_Set"))); this.add(backgroundPane, BorderLayout.SOUTH); } @@ -369,8 +369,8 @@ public class FormEditToolBar extends BasicPane { private JPanel getExport() { JPanel export = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); // export.setLayout(new BoxLayout(export, BoxLayout.Y_AXIS)); - excelP = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Page")); - excelO = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Simple")); + excelP = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Excel_Page")); + excelO = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Output_Excel_Simple")); export.add(excelP); export.add(Box.createVerticalStrut(2)); export.add(excelO); diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java index e3e3492fc..e5711c1d4 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java @@ -214,7 +214,7 @@ public class FormParaWidgetPane extends JPanel { for (int i = 0; i < COMMON_CHAR_NUM; i++) { chartTypePane.add(new ToolBarButton(loadChartOptions()[i])); } - add(createChartCombinationPane(chartTypePane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Chart"))); + add(createChartCombinationPane(chartTypePane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"))); jSeparatorChart = createJSeparator(); add(jSeparatorChart); } @@ -229,7 +229,7 @@ public class FormParaWidgetPane extends JPanel { for (int i = 0; i < num; i++) { widgetPane.add(new ToolBarButton(predifinedwidgeList.get(i))); } - add(createWidgetCombinationPane(widgetPane, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Widget"))); + add(createWidgetCombinationPane(widgetPane, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Widget"))); add(createJSeparator()); } @@ -443,4 +443,4 @@ public class FormParaWidgetPane extends JPanel { } return chartOptions; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java index e00510fb7..4ec97bc00 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java @@ -55,7 +55,7 @@ public class FormWidgetDetailPane extends FormDockView{ private CardLayout card; private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Report"); - private static final String CHART_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Form-ToolBar_Chart"); + private static final String CHART_TAB = com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_ToolBar_Chart"); public static FormWidgetDetailPane getInstance() { if (HOLDER.singleton == null) { @@ -439,4 +439,4 @@ public class FormWidgetDetailPane extends FormDockView{ } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java index 3165d08c5..960f5cf6f 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java @@ -647,7 +647,7 @@ public class JForm extends JTemplate implements BaseJForm { }; UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Authority_Edit")); uiLabel.setHorizontalAlignment(SwingConstants.CENTER); - uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-All_MSBold"), 0, 14)); + uiLabel.setFont(new Font(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_All_MSBold"), 0, 14)); uiLabel.setForeground(new Color(150, 150, 150)); panel.add(uiLabel, BorderLayout.CENTER); return panel; @@ -921,4 +921,4 @@ public class JForm extends JTemplate implements BaseJForm { public String route() { return ViewRequestConstants.FORM_VIEW_PATH; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java index b62725caa..395776697 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java @@ -66,7 +66,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Settings"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Control_Setting"); } @@ -397,4 +397,4 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope public Location preferredLocation() { return Location.WEST_BELOW; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java index e49520e04..ca75fa994 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java @@ -3,15 +3,6 @@ */ package com.fr.design.mainframe.widget.editors; -import java.awt.BorderLayout; -import java.awt.Component; -import java.awt.Container; -import java.awt.Dimension; -import java.awt.GridLayout; -import java.awt.LayoutManager; - -import javax.swing.JPanel; - import com.fr.design.dialog.BasicDialog; import com.fr.design.dialog.BasicPane; import com.fr.design.gui.ilable.UILabel; @@ -19,6 +10,14 @@ import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.form.ui.PaddingMargin; +import javax.swing.JPanel; +import java.awt.BorderLayout; +import java.awt.Component; +import java.awt.Container; +import java.awt.Dimension; +import java.awt.GridLayout; +import java.awt.LayoutManager; + /** * @author richer @@ -38,7 +37,7 @@ public class PaddingMarginPane extends BasicPane { contentPane = new JPanel(new GridLayout(2, 2, 4, 4)); this.add(contentPane); JPanel topPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - topPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Top") + " "), BorderLayout.WEST); + topPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Top") + " "), BorderLayout.WEST); topSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); topPane.add(topSpinner, BorderLayout.CENTER); UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -46,7 +45,7 @@ public class PaddingMarginPane extends BasicPane { contentPane.add(topPane); JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Left") + " "), BorderLayout.WEST); + leftPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Left") + " "), BorderLayout.WEST); leftSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); leftPane.add(leftSpinner, BorderLayout.CENTER); UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -54,7 +53,7 @@ public class PaddingMarginPane extends BasicPane { contentPane.add(leftPane); JPanel bottomPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - bottomPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Bottom") + " "), BorderLayout.WEST); + bottomPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Bottom") + " "), BorderLayout.WEST); bottomSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); bottomPane.add(bottomSpinner, BorderLayout.CENTER); UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -62,7 +61,7 @@ public class PaddingMarginPane extends BasicPane { contentPane.add(bottomPane); JPanel rightPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Base_Right") + " "), BorderLayout.WEST); + rightPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Right") + " "), BorderLayout.WEST); rightSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0); rightPane.add(rightSpinner, BorderLayout.CENTER); UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); @@ -103,7 +102,7 @@ public class PaddingMarginPane extends BasicPane { @Override protected String title4PopupWindow() { - return com.fr.design.i18n.Toolkit.i18nText("FR-Base_Margin"); + return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Base_Margin"); } public void populate(PaddingMargin pm) { @@ -124,4 +123,4 @@ public class PaddingMarginPane extends BasicPane { pm.setRight((int) rightSpinner.getValue()); return pm; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java index 17eda1d2a..65e66af08 100644 --- a/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java @@ -93,8 +93,8 @@ public class RootDesignDefinePane extends AbstractDataModify { BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; Integer[] hAlignment = new Integer[]{FormConstants.LEFTPOSITION, FormConstants.CENTERPOSITION, FormConstants.RIGHTPOSITION}; hAlignmentPane = new UIButtonGroup(hAlignmentIconArray, hAlignment); - hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") - , com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); + hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left") + , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")}); double f = TableLayout.FILL; double p = TableLayout.PREFERRED; double[] rowSize = {p, p, p, p, p}; @@ -157,4 +157,4 @@ public class RootDesignDefinePane extends AbstractDataModify { return null; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java index ac89c40a0..31ec3da19 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java @@ -34,7 +34,7 @@ public class CheckBoxDefinePane extends AbstractDataModify { text = new UITextField(); fontSizePane = new FontSizeComboPane(); labelNameTextField = new UITextField(); - UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")); + UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); double f = TableLayout.FILL; @@ -79,4 +79,4 @@ public class CheckBoxDefinePane extends AbstractDataModify { box.setLabelName(labelNameTextField.getText()); return box; } -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java index d78defe08..daa7f2234 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java @@ -55,7 +55,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane e @Override protected JPanel setFirstContentPane() { JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); - UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value")); + UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value")); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null}; @@ -101,4 +101,4 @@ public abstract class DirectWriteEditorDefinePane e } protected abstract T updateSubDirectWriteEditorBean(); -} \ No newline at end of file +} diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java index bd7de6e2d..06fe0a5e0 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java @@ -54,15 +54,15 @@ public class LabelDefinePane extends AbstractDataModify