Browse Source

Merge pull request #339 in DESIGN/design from ~HARRISON/design:release/10.0 to release/10.0

* commit '4add75355b913f6daa58455dee108050d4822f9b':
  REPORT-10025 10.0 & 5.0版本依据国际化规范调整国际化内容
research/10.0
Harrison 6 years ago
parent
commit
b5f27c145c
  1. 2
      designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
  2. 14
      designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java
  3. 2
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java
  4. 2
      designer-base/src/main/java/com/fr/design/actions/help/alphafine/RemindPane.java
  5. 43
      designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java
  6. 4
      designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java
  7. 13
      designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java
  8. 2
      designer-base/src/main/java/com/fr/design/data/datapane/TableDataTreePane.java
  9. 2
      designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java
  10. 4
      designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java
  11. 2
      designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java
  12. 2
      designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java
  13. 4
      designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java
  14. 2
      designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java
  15. 2
      designer-base/src/main/java/com/fr/design/formula/FunctionConstants.java
  16. 14
      designer-base/src/main/java/com/fr/design/gui/controlpane/JListControlPane.java
  17. 14
      designer-base/src/main/java/com/fr/design/gui/controlpane/UIListControlPane.java
  18. 2
      designer-base/src/main/java/com/fr/design/gui/controlpane/UISimpleListControlPane.java
  19. 2
      designer-base/src/main/java/com/fr/design/gui/iprogressbar/ProgressDialog.java
  20. 19
      designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java
  21. 11
      designer-base/src/main/java/com/fr/design/gui/style/FRFontPane.java
  22. 6
      designer-base/src/main/java/com/fr/design/gui/style/FormatPane.java
  23. 2
      designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java
  24. 6
      designer-base/src/main/java/com/fr/design/mainframe/backgroundpane/ImageBackgroundQuickPane.java
  25. 3
      designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java
  26. 2
      designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java
  27. 2
      designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java
  28. 4
      designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java
  29. 6
      designer-base/src/main/java/com/fr/design/remote/ui/AuthorityListControlPane.java
  30. 2
      designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java
  31. 4
      designer-base/src/main/java/com/fr/design/style/color/ColorSelectPane.java
  32. 4
      designer-base/src/main/java/com/fr/design/style/color/NewColorSelectPane.java
  33. 2
      designer-base/src/main/java/com/fr/design/utils/DesignUtils.java
  34. 20
      designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java
  35. 10
      designer-base/src/main/java/com/fr/env/RemoteEnvPane.java
  36. 26
      designer-base/src/main/java/com/fr/file/FILEChooserPane.java
  37. 5
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/ChartConditionPane.java
  38. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/dlp/Bar2DDataLabelPane.java
  39. 4
      designer-chart/src/main/java/com/fr/design/chart/series/SeriesCondition/impl/ChartHyperPopAttrPane.java
  40. 4
      designer-chart/src/main/java/com/fr/design/mainframe/chart/gui/style/ChartAxisLabelPane.java
  41. 2
      designer-chart/src/main/java/com/fr/design/module/ChartEmptyDataStylePane.java
  42. 6
      designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java
  43. 2
      designer-chart/src/main/java/com/fr/van/chart/designer/component/format/FormatPaneWithOutFont.java
  44. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java
  45. 4
      designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java
  46. 2
      designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java
  47. 2
      designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/VanChartStructureSeriesPane.java
  48. 4
      designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java
  49. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XPassword.java
  50. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XTextArea.java
  51. 4
      designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java
  52. 2
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveEndAction.java
  53. 2
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveFirstAction.java
  54. 2
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMoveNextAction.java
  55. 2
      designer-form/src/main/java/com/fr/design/designer/creator/cardlayout/TabMovePrevAction.java
  56. 8
      designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteBodyLayoutPropertiesGroupModel.java
  57. 4
      designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java
  58. 16
      designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java
  59. 6
      designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java
  60. 4
      designer-form/src/main/java/com/fr/design/gui/core/FormWidgetOption.java
  61. 10
      designer-form/src/main/java/com/fr/design/gui/xpane/CardTagLayoutBorderPane.java
  62. 62
      designer-form/src/main/java/com/fr/design/gui/xpane/LayoutBorderPane.java
  63. 4
      designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java
  64. 5
      designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java
  65. 10
      designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java
  66. 6
      designer-form/src/main/java/com/fr/design/mainframe/FormParaWidgetPane.java
  67. 4
      designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java
  68. 4
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  69. 4
      designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java
  70. 29
      designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java
  71. 6
      designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java
  72. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java
  73. 6
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java
  74. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java
  75. 6
      designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java
  76. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java
  77. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java
  78. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java
  79. 8
      designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java
  80. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java
  81. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java
  82. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java
  83. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java
  84. 4
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java
  85. 2
      designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java
  86. 11
      designer-realize/src/main/java/com/fr/design/actions/cell/EditCellAction.java
  87. 4
      designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java
  88. 4
      designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java
  89. 44
      designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java
  90. 4
      designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java
  91. 4
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java
  92. 2
      designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java
  93. 26
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/BBSLoginDialog.java
  94. 4
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/ExitLabel.java
  95. 4
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java
  96. 4
      designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java
  97. 4
      designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java
  98. 3
      designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java
  99. 6
      designer-realize/src/main/java/com/fr/design/present/BarCodePane.java
  100. 4
      designer-realize/src/main/java/com/fr/design/present/CellWriteAttrPane.java
  101. Some files were not shown because too many files have changed in this diff Show More

2
designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java

@ -111,7 +111,7 @@ public class SwitchExistEnv extends MenuDef {
} }
}); });
} catch (AuthException exception) { } 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")); null, 0, UIManager.getIcon("OptionPane.errorIcon"));
} }
} }

14
designer-base/src/main/java/com/fr/design/actions/help/AboutPane.java

@ -50,8 +50,8 @@ public class AboutPane extends JPanel {
getBuildTitle(), getBuildTitle(),
GeneralUtils.readFullBuildNO(), GeneralUtils.readFullBuildNO(),
new String[]{ new String[]{
com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Build_NO"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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_OK")
}); });
contentPane.add(buildCopyPane); contentPane.add(buildCopyPane);
@ -62,11 +62,11 @@ public class AboutPane extends JPanel {
contentPane.add(boxCenterAlignmentPane); contentPane.add(boxCenterAlignmentPane);
contentPane.add(new BoxCenterAlignmentCopyablePane( 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(), DesignerEnvManager.getEnvManager().getActivationKey(),
new String[]{ new String[]{
com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Copy_Activation_Key"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_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_Activation_Key_Copy_OK")
})); }));
addPhoneAndQQPane(contentPane); addPhoneAndQQPane(contentPane);
@ -118,7 +118,7 @@ public class AboutPane extends JPanel {
} }
private JPanel getRemarkPane() { 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(); UILabel label = new UILabel();
label.setSize(new Dimension(580, 30)); label.setSize(new Dimension(580, 30));
@ -317,4 +317,4 @@ public class AboutPane extends JPanel {
} }
} }
} }
} }

2
designer-base/src/main/java/com/fr/design/actions/help/alphafine/AlphaFineConfigPane.java

@ -108,7 +108,7 @@ public class AlphaFineConfigPane extends BasicPane {
initFieldListener(); initFieldListener();
northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":")); northPane.add(new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Open") + ":"));
northPane.add(shortcutsField); 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); label.setForeground(Color.RED);
northPane.add(label); northPane.add(label);
contentPane.add(northPane); contentPane.add(northPane);

2
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.setFont(MEDIUM_FONT);
noRemindLabel.setForeground(Color.WHITE); noRemindLabel.setForeground(Color.WHITE);
checkLabel = new UILabel(); checkLabel = new UILabel();

43
designer-base/src/main/java/com/fr/design/condition/DSColumnLiteConditionPane.java

@ -1,41 +1,38 @@
package com.fr.design.condition; 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.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.condition.JoinCondition;
import com.fr.data.core.Compare; import com.fr.data.core.Compare;
import com.fr.design.beans.BasicBeanPane; 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.CustomVariableResolver;
import com.fr.design.formula.VariableResolver; import com.fr.design.formula.VariableResolver;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.icombobox.UIComboBoxRenderer; 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.gui.itree.refreshabletree.ExpandMutableTreeNode;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.editor.ValueEditorPane; import com.fr.design.mainframe.JTemplate;
import com.fr.design.editor.ValueEditorPaneFactory; import com.fr.general.ComparatorUtils;
import com.fr.design.editor.editor.ColumnIndexEditor; import com.fr.general.data.Condition;
import com.fr.design.editor.editor.ColumnNameEditor;
import com.fr.design.editor.editor.Editor;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.StringUtils; 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<CommonCondition> { public class DSColumnLiteConditionPane extends LiteConditionPane<CommonCondition> {
/** /**
* *
@ -121,7 +118,7 @@ public class DSColumnLiteConditionPane extends LiteConditionPane<CommonCondition
keyColumnPane.setPreferredSize(new Dimension(175, keyColumnPane.getPreferredSize().height)); keyColumnPane.setPreferredSize(new Dimension(175, keyColumnPane.getPreferredSize().height));
conditionOPComboBox.setPreferredSize(new Dimension(80, 20)); conditionOPComboBox.setPreferredSize(new Dimension(80, 20));
Component[][] components = { Component[][] components = {
{ new UILabel(com.fr.design.i18n.Toolkit.i18nText("Utils-Available_Columns") + ":"), new UILabel(com.fr.design.i18n.Toolkit.i18nText("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() }, { keyColumnPane, conditionOPComboBox, conditionValuePane } }; new UILabel() }, { keyColumnPane, conditionOPComboBox, conditionValuePane } };
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
@ -197,4 +194,4 @@ public class DSColumnLiteConditionPane extends LiteConditionPane<CommonCondition
} }
} }

4
designer-base/src/main/java/com/fr/design/condition/SingleConditionPane.java

@ -26,7 +26,7 @@ public abstract class SingleConditionPane<T> extends BasicPane {
if(cancel == null) { if(cancel == null) {
cancel = new UIButton(BaseUtils.readIcon("/com/fr/base/images/cell/control/remove.png")); 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.addActionListener(cancleListener);
cancel.setMargin(new Insets(0, 0, 0, 0)); cancel.setMargin(new Insets(0, 0, 0, 0));
} }
@ -51,4 +51,4 @@ public abstract class SingleConditionPane<T> extends BasicPane {
public abstract void populate(T condition); public abstract void populate(T condition);
public abstract T update(); public abstract T update();
} }

13
designer-base/src/main/java/com/fr/design/data/datapane/EditOrNewLabel.java

@ -1,12 +1,11 @@
package com.fr.design.data.datapane; 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.base.BaseUtils;
import com.fr.design.data.datapane.FlashLookLabelMouseAdapter.ReleaseAction; 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) { public EditOrNewLabel(Editable editable, JPanel editPane) {
super(BaseUtils.readIcon("/com/fr/design/images/m_file/edit.png")); 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.setCursor(new Cursor(Cursor.HAND_CURSOR));
this.editable = editable; this.editable = editable;
this.editTablePane = editPane; this.editTablePane = editPane;
@ -31,4 +30,4 @@ public class EditOrNewLabel extends UILabel {
public static interface Editable { public static interface Editable {
public void edit(JPanel jPanel); public void edit(JPanel jPanel);
} }
} }

2
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().registerComponent(dataTree);
ToolTipManager.sharedInstance().setDismissDelay(3000); ToolTipManager.sharedInstance().setDismissDelay(3000);
ToolTipManager.sharedInstance().setInitialDelay(0); 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); addMenuDef.setIconPath(IconPathConstants.ADD_POPMENU_ICON_PATH);
createAddMenuDef(); createAddMenuDef();

2
designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/ClassTableDataPane.java

@ -63,7 +63,7 @@ public class ClassTableDataPane extends AbstractTableDataPane<ClassTableData> {
dlg.setVisible(true); 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.setPreferredSize(new Dimension(
editButton.getPreferredSize().width, editButton.getPreferredSize().width,
classNameTextField.getPreferredSize().height)); classNameTextField.getPreferredSize().height));

4
designer-base/src/main/java/com/fr/design/extra/PluginInstalledPane.java

@ -124,7 +124,7 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
null, null,
new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Restart_Designer"), 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_Restart_Designer_Later"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Cancel") com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cancel")
}, },
null null
); );
@ -155,4 +155,4 @@ public class PluginInstalledPane extends PluginAbstractViewPane {
protected String title4PopupWindow() { protected String title4PopupWindow() {
return "Installed"; return "Installed";
} }
} }

2
designer-base/src/main/java/com/fr/design/extra/PluginOperateUtils.java

@ -169,7 +169,7 @@ public class PluginOperateUtils {
String username = MarketConfig.getInstance().getBbsUsername(); String username = MarketConfig.getInstance().getBbsUsername();
if (StringUtils.isEmpty(username)) { if (StringUtils.isEmpty(username)) {
jsCallback.execute(StringUtils.EMPTY); 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 { } else {
uiLabel.setText(username); uiLabel.setText(username);
String result = username; String result = username;

2
designer-base/src/main/java/com/fr/design/extra/PluginWebBridge.java

@ -556,7 +556,7 @@ public class PluginWebBridge {
public void clearUserInfo() { public void clearUserInfo() {
MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY); MarketConfig.getInstance().setInShowBBsName(StringUtils.EMPTY);
BBSLoginUtils.bbsLogout(); 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){ public void getPackInfo(final JSObject callback){

4
designer-base/src/main/java/com/fr/design/extra/QQLoginWebPane.java

@ -168,7 +168,7 @@ public class QQLoginWebPane extends JFXPanel {
new Scene( new Scene(
HBoxBuilder.create().styleClass("modal-dialog").children( HBoxBuilder.create().styleClass("modal-dialog").children(
LabelBuilder.create().text(msg).build(), LabelBuilder.create().text(msg).build(),
ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Switch-Account")).defaultButton(true).onAction(new EventHandler<ActionEvent>() { ButtonBuilder.create().text(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Switch_Account")).defaultButton(true).onAction(new EventHandler<ActionEvent>() {
@Override @Override
public void handle(ActionEvent actionEvent) { public void handle(ActionEvent actionEvent) {
// take action and close the dialog. // take action and close the dialog.
@ -224,4 +224,4 @@ public class QQLoginWebPane extends JFXPanel {
} }
}); });
} }
} }

2
designer-base/src/main/java/com/fr/design/extra/WebViewDlgHelper.java

@ -81,7 +81,7 @@ public class WebViewDlgHelper {
} else { } else {
int rv = JOptionPane.showConfirmDialog( int rv = JOptionPane.showConfirmDialog(
null, 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"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Plugin_Warning"),
JOptionPane.OK_CANCEL_OPTION, JOptionPane.OK_CANCEL_OPTION,
JOptionPane.INFORMATION_MESSAGE JOptionPane.INFORMATION_MESSAGE

2
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() { public static FunctionGroup PLUGIN = new FunctionGroup() {
@Override @Override
public String getGroupName() { 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 @Override

14
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.MultiTDTableDataPane;
import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane; import com.fr.design.data.tabledata.tabledatapane.TreeTableDataPane;
import com.fr.design.gui.HyperlinkFilterHelper; import com.fr.design.gui.HyperlinkFilterHelper;
import com.fr.design.gui.NameInspector;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilist.JNameEdList; import com.fr.design.gui.ilist.JNameEdList;
import com.fr.design.gui.ilist.ListModelElement; import com.fr.design.gui.ilist.ListModelElement;
import com.fr.design.gui.ilist.ModNameActionListener; import com.fr.design.gui.ilist.ModNameActionListener;
import com.fr.design.i18n.Toolkit;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.menu.LineSeparator; import com.fr.design.menu.LineSeparator;
import com.fr.design.menu.MenuDef; import com.fr.design.menu.MenuDef;
@ -357,7 +355,7 @@ public abstract class JListControlPane extends JControlPane {
public AddItemUpdateAction(NameableCreator[] creators) { public AddItemUpdateAction(NameableCreator[] creators) {
this.creator = creators[0]; 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.setMnemonic('A');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); 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 { protected class AddItemMenuDef extends MenuDef {
public AddItemMenuDef(NameableCreator[] creators) { 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.setMnemonic('A');
this.setIconPath("/com/fr/design/images/control/addPopup.png"); this.setIconPath("/com/fr/design/images/control/addPopup.png");
wrapActionListener(creators); wrapActionListener(creators);
@ -420,7 +418,7 @@ public abstract class JListControlPane extends JControlPane {
*/ */
private class RemoveItemAction extends UpdateAction { private class RemoveItemAction extends UpdateAction {
public RemoveItemAction() { 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.setMnemonic('R');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon("/com/fr/base/images/cell/control/remove.png")); .readIcon("/com/fr/base/images/cell/control/remove.png"));
@ -448,7 +446,7 @@ public abstract class JListControlPane extends JControlPane {
*/ */
private class CopyItemAction extends UpdateAction { private class CopyItemAction extends UpdateAction {
public CopyItemAction() { 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.setMnemonic('C');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon("/com/fr/design/images/m_edit/copy.png")); .readIcon("/com/fr/design/images/m_edit/copy.png"));
@ -547,7 +545,7 @@ public abstract class JListControlPane extends JControlPane {
private boolean isAtoZ = false; private boolean isAtoZ = false;
public SortItemAction() { 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.setMnemonic('S');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon("/com/fr/design/images/control/sortAsc.png")); .readIcon("/com/fr/design/images/control/sortAsc.png"));
@ -876,4 +874,4 @@ public abstract class JListControlPane extends JControlPane {
protected boolean filterNameableCreator(NameableCreator creator) { protected boolean filterNameableCreator(NameableCreator creator) {
return !HyperlinkFilterHelper.whetherAddHyperlink4cell(creator.menuName()); return !HyperlinkFilterHelper.whetherAddHyperlink4cell(creator.menuName());
} }
} }

14
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.ibutton.UIButton;
import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.icontainer.UIScrollPane;
import com.fr.design.gui.ilist.ListModelElement; 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.gui.ilist.UINameEdList;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
@ -29,7 +28,6 @@ import com.fr.general.ComparatorUtils;
import com.fr.stable.ArrayUtils; import com.fr.stable.ArrayUtils;
import com.fr.stable.Nameable; import com.fr.stable.Nameable;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
import com.fr.stable.core.PropertyChangeAdapter;
import javax.swing.*; import javax.swing.*;
import javax.swing.event.ListDataEvent; import javax.swing.event.ListDataEvent;
@ -387,7 +385,7 @@ public abstract class UIListControlPane extends UIControlPane {
public AddItemUpdateAction(NameableCreator[] creators) { public AddItemUpdateAction(NameableCreator[] creators) {
this.creator = creators[0]; 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.setMnemonic('A');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); 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 { protected class AddItemMenuDef extends MenuDef {
public AddItemMenuDef(NameableCreator[] creators) { public AddItemMenuDef(NameableCreator[] creators) {
super(true); 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.setMnemonic('A');
this.setIconPath("/com/fr/design/images/control/addPopup.png"); this.setIconPath("/com/fr/design/images/control/addPopup.png");
wrapActionListener(creators); wrapActionListener(creators);
@ -507,7 +505,7 @@ public abstract class UIListControlPane extends UIControlPane {
*/ */
private class RemoveItemAction extends UpdateAction { private class RemoveItemAction extends UpdateAction {
public RemoveItemAction() { 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.setMnemonic('R');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon("/com/fr/base/images/cell/control/remove.png")); .readIcon("/com/fr/base/images/cell/control/remove.png"));
@ -536,7 +534,7 @@ public abstract class UIListControlPane extends UIControlPane {
*/ */
private class CopyItemAction extends UpdateAction { private class CopyItemAction extends UpdateAction {
public CopyItemAction() { 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.setMnemonic('C');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon("/com/fr/design/images/m_edit/copy.png")); .readIcon("/com/fr/design/images/m_edit/copy.png"));
@ -635,7 +633,7 @@ public abstract class UIListControlPane extends UIControlPane {
private boolean isAtoZ = false; private boolean isAtoZ = false;
public SortItemAction() { 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.setMnemonic('S');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon("/com/fr/design/images/control/sortAsc.png")); .readIcon("/com/fr/design/images/control/sortAsc.png"));
@ -1033,4 +1031,4 @@ public abstract class UIListControlPane extends UIControlPane {
nameableList.setSelectedIndex(index); nameableList.setSelectedIndex(index);
} }
} }

2
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; private boolean isAtoZ = false;
public SortItemAction() { 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.setMnemonic('S');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon("/com/fr/design/images/control/sortAsc.png")); .readIcon("/com/fr/design/images/control/sortAsc.png"));

2
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.setOpaque(false);
progressBar.setBorder(null); progressBar.setBorder(null);
panel.add(progressBar, BorderLayout.CENTER); 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)); FRFont font = FRFont.getInstance().applySize(14).applyForeground(new ColorUIResource(333334));
text.setFont(font); text.setFont(font);
panel.add(text, BorderLayout.SOUTH); panel.add(text, BorderLayout.SOUTH);

19
designer-base/src/main/java/com/fr/design/gui/itableeditorpane/UITableModelAdapter.java

@ -1,10 +1,8 @@
package com.fr.design.gui.itableeditorpane; package com.fr.design.gui.itableeditorpane;
import java.awt.Component; import com.fr.base.BaseUtils;
import java.awt.event.ActionEvent; import com.fr.base.FRContext;
import java.util.ArrayList; import com.fr.design.mainframe.DesignerContext;
import java.util.Collections;
import java.util.List;
import javax.swing.JOptionPane; import javax.swing.JOptionPane;
import javax.swing.JTable; import javax.swing.JTable;
@ -12,10 +10,11 @@ import javax.swing.ListSelectionModel;
import javax.swing.table.AbstractTableModel; import javax.swing.table.AbstractTableModel;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
import java.awt.Component;
import com.fr.base.BaseUtils; import java.awt.event.ActionEvent;
import com.fr.base.FRContext; import java.util.ArrayList;
import com.fr.design.mainframe.DesignerContext; import java.util.Collections;
import java.util.List;
/** /**
@ -200,7 +199,7 @@ public abstract class UITableModelAdapter<T extends Object> extends AbstractTabl
protected abstract class EditAction extends UITableEditAction { protected abstract class EditAction extends UITableEditAction {
public EditAction() { 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")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png"));
} }

11
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.ibutton.UIToggleButton;
import com.fr.design.gui.icombobox.LineComboBox; import com.fr.design.gui.icombobox.LineComboBox;
import com.fr.design.gui.icombobox.UIComboBox; import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.TableLayout; import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.design.utils.gui.GUICoreUtils; 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"))) { if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"))) {
frFont = frFont.applyStyle(fontSizeStyleComboBox.getSelectedIndex()); 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())); frFont = frFont.applySize(Float.parseFloat(fontSizeComboBox.getSelectedItem().toString()));
} }
if (ComparatorUtils.equals(globalNameListener.getGlobalName(), com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"))) { 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()); frFont = frFont.applyUnderline(this.underlineCombo.getSelectedLineStyle());
} }
@ -267,12 +266,12 @@ public class FRFontPane extends AbstractBasicStylePane implements GlobalNameObse
private void initAllNames() { private void initAllNames() {
fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style")); fontSizeStyleComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Style"));
fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Name")); 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")); colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Foreground"));
italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic")); italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_italic"));
bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold")); bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_bold"));
underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Underline")); 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")); isStrikethroughCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Strikethrough"));
isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow")); isShadowCheckBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Shadow"));
superPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_FRFont_Superscript")); 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); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
} }
} }
} }

6
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) { protected Component[][] getComponent (JPanel fontPane, JPanel centerPane, JPanel typePane) {
return new Component[][]{ return new Component[][]{
new Component[]{null, null}, 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[]{centerPane, null},
new Component[]{fontPane, frFontPane}, new Component[]{fontPane, frFontPane},
}; };
@ -158,7 +158,7 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
private void iniSampleLable() { private void iniSampleLable() {
Border innterborder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4); Border innterborder = new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 4);
Font tmpFont = null; 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()) { sampleLabel = new UILabel(FormatField.getInstance().getFormatValue()) {
@Override @Override
@ -432,4 +432,4 @@ public class FormatPane extends AbstractBasicStylePane implements GlobalNameObs
public void setGlobalName(String name) { public void setGlobalName(String name) {
} }
} }

2
designer-base/src/main/java/com/fr/design/mainframe/TemplatePane.java

@ -164,7 +164,7 @@ public class TemplatePane extends JPanel implements MouseListener {
} }
setJLabel(selectedName); setJLabel(selectedName);
} catch (AuthException e) { } 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")); null, 0, UIManager.getIcon("OptionPane.errorIcon"));
return false; return false;
} }

6
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) { public ImageBackgroundQuickPane(boolean hasImageLayout) {
this.setLayout(new BorderLayout(0, 4)); 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}; Byte[] valueArray = {Constants.IMAGE_CENTER, Constants.IMAGE_TILED, Constants.IMAGE_EXTEND, Constants.IMAGE_ADJUST};
imageLayoutPane = new UIButtonGroup<Byte>(nameArray, valueArray); imageLayoutPane = new UIButtonGroup<Byte>(nameArray, valueArray);
imageLayoutPane.setSelectedIndex(0); imageLayoutPane.setSelectedIndex(0);
@ -174,7 +174,7 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
*/ */
@Override @Override
public String title4PopupWindow() { 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 @Override
@ -182,4 +182,4 @@ public class ImageBackgroundQuickPane extends BackgroundQuickPane {
imageLayoutPane.setSelectedIndex(0); imageLayoutPane.setSelectedIndex(0);
previewPane.setImage(null); previewPane.setImage(null);
} }
} }

3
designer-base/src/main/java/com/fr/design/mainframe/toolbar/ToolBarMenuDock.java

@ -3,7 +3,6 @@
*/ */
package com.fr.design.mainframe.toolbar; package com.fr.design.mainframe.toolbar;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.base.vcs.DesignerMode; import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignState; import com.fr.design.DesignState;
@ -564,7 +563,7 @@ public abstract class ToolBarMenuDock {
}; };
UILabel uiLabel = new UILabel(text); UILabel uiLabel = new UILabel(text);
uiLabel.setHorizontalAlignment(SwingConstants.CENTER); 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)); uiLabel.setForeground(new Color(150, 150, 150));
panel.add(uiLabel, BorderLayout.CENTER); panel.add(uiLabel, BorderLayout.CENTER);
return panel; return panel;

2
designer-base/src/main/java/com/fr/design/menu/KeySetUtils.java

@ -536,7 +536,7 @@ public class KeySetUtils {
@Override @Override
public String getMenuName() { 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 @Override

2
designer-base/src/main/java/com/fr/design/remote/action/RemoteDesignAuthorityManagerAction.java

@ -21,7 +21,7 @@ public class RemoteDesignAuthorityManagerAction extends UpdateAction {
public RemoteDesignAuthorityManagerAction() { 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")); this.setSmallIcon(BaseUtils.readIcon("com/fr/design/remote/images/icon_Remote_Design_Permission_Manager_normal@1x.png"));
} }

4
designer-base/src/main/java/com/fr/design/remote/ui/AuthorityEditorPane.java

@ -31,7 +31,7 @@ public class AuthorityEditorPane extends BasicBeanPane<DesignAuthority> {
BorderFactory.createCompoundBorder( BorderFactory.createCompoundBorder(
new EmptyBorder(6, 0, 6, 6), new EmptyBorder(6, 0, 6, 6),
UITitledBorder.createBorderWithTitle( 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<DesignAuthority> {
@Override @Override
protected String title4PopupWindow() { 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 @Override

6
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.setLayout(FRGUIPaneFactory.createBorderLayout());
this.authorityCreators = new RemoteDesignAuthorityCreator[]{ this.authorityCreators = new RemoteDesignAuthorityCreator[]{
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"), BaseUtils.readIcon("com/fr/design/remote/images/icon_Member_normal@1x.png"),
DesignAuthority.class, DesignAuthority.class,
AuthorityEditorPane.class) AuthorityEditorPane.class)
@ -470,7 +470,7 @@ public class AuthorityListControlPane extends BasicPane {
private class AddItemUpdateAction extends UpdateAction { private class AddItemUpdateAction extends UpdateAction {
AddItemUpdateAction() { 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.setMnemonic('A');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png")); 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 { private class RemoveItemAction extends UpdateAction {
RemoveItemAction() { 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.setMnemonic('R');
this.setSmallIcon(BaseUtils this.setSmallIcon(BaseUtils
.readIcon(IconPathConstants.TD_REMOVE_ICON_PATH)); .readIcon(IconPathConstants.TD_REMOVE_ICON_PATH));

2
designer-base/src/main/java/com/fr/design/remote/ui/AuthorityManagerPane.java

@ -23,7 +23,7 @@ public class AuthorityManagerPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { 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) { public void populate(DesignAuthority[] authorities) {

4
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)); 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() { customButton.addMouseListener(new MouseAdapter() {
@Override @Override
@ -198,4 +198,4 @@ public class ColorSelectPane extends TransparentPane implements ColorSelectable
pane = new ColorSelectDetailPane(Color.WHITE); pane = new ColorSelectDetailPane(Color.WHITE);
ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this); ColorSelectDialog.showDialog(DesignerContext.getDesignerFrame(), pane, Color.WHITE, this);
} }
} }

4
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)); centerPane.add(Box.createVerticalStrut(1));
// mod by anchore 16/11/16 // 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() { customButton.addMouseListener(new MouseAdapter() {
@Override @Override
@ -203,4 +203,4 @@ public class NewColorSelectPane extends BasicPane implements ColorSelectable {
} }
} }

2
designer-base/src/main/java/com/fr/design/utils/DesignUtils.java

@ -237,7 +237,7 @@ public class DesignUtils {
//比如想在中文或英文系统里用韩文设计器 //比如想在中文或英文系统里用韩文设计器
guiFRFont = getNamedFont("Dialog"); guiFRFont = getNamedFont("Dialog");
if (!guiFRFont.canDisplay(displayChar)) { 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"));
} }
} }
} }

20
designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@ -134,7 +134,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
northPane.add(typePane, BorderLayout.NORTH); northPane.add(typePane, BorderLayout.NORTH);
chooseTable = new ChoosePaneSupportFormula(); 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); chooseTable.setTableNameComboBoxPopSize(160, 320);
northPane.add(chooseTable, BorderLayout.CENTER); northPane.add(chooseTable, BorderLayout.CENTER);
@ -142,7 +142,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
// peter:编辑的TablePane // peter:编辑的TablePane
JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel editTablePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
this.add(editTablePane, BorderLayout.CENTER); 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(); keyColumnValuesTable = new KeyColumnNameValueTable();
editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER); editTablePane.add(new JScrollPane(this.keyColumnValuesTable), BorderLayout.CENTER);
@ -183,11 +183,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("RWA-NotChange_Unmodified")); UpdateCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("RWA-NotChange_Unmodified"));
UIButton helpButton = new UIButton(HEIP_ICON); 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() { helpButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { 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), BasicDialog dlg = formatExplanation.showMediumWindow(SwingUtilities.getWindowAncestor(DBManipulationPane.this),
new DialogActionAdapter(){}); new DialogActionAdapter(){});
dlg.setVisible(true); dlg.setVisible(true);
@ -309,7 +309,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
protected void setBorderAndLayout(JPanel jPanel){ protected void setBorderAndLayout(JPanel jPanel){
jPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); jPanel.setLayout(FRGUIPaneFactory.createBorderLayout());
jPanel.setBorder(BorderFactory.createTitledBorder( 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){ protected void addComponent(JPanel mainPane,JScrollPane addPane){
@ -475,7 +475,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
} }
for (int j = 0; j < keyColumnNameValueList.size(); j++) { for (int j = 0; j < keyColumnNameValueList.size(); j++) {
if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { 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, returnValue = JOptionPane.showOptionDialog(DBManipulationPane.this,
com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Cover_Tips", keyColumnNameValueList.get(j).cn.name), 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]); "", JOptionPane.DEFAULT_OPTION, JOptionPane.INFORMATION_MESSAGE, null, options, options[0]);
@ -580,7 +580,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
} }
int returnVal = JOptionPane.showConfirmDialog(SwingUtilities.getWindowAncestor(DBManipulationPane.this), 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); JOptionPane.QUESTION_MESSAGE);
if (returnVal == JOptionPane.OK_OPTION) { if (returnVal == JOptionPane.OK_OPTION) {
KeyColumnTableModel keyColumnNameValueTableModel = (KeyColumnTableModel)keyColumnValuesTable.getModel(); KeyColumnTableModel keyColumnNameValueTableModel = (KeyColumnTableModel)keyColumnValuesTable.getModel();
@ -944,9 +944,9 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
} }
protected abstract static class KeyColumnTableModel extends AbstractTableModel { 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 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("FR-Base_Column"); 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("FR-Base_Value"); 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}; public static final String[] COLUMN_NAMES = new String[]{RAW_KEY, COLUMN, VALUE};

10
designer-base/src/main/java/com/fr/env/RemoteEnvPane.java vendored

@ -534,20 +534,20 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
try { try {
Boolean result = get(); Boolean result = get();
if (result == null) { 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")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
} else { } else {
if (result) { 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")); uiLabel.setIcon(UIManager.getIcon("OptionPane.informationIcon"));
} else { } 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")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
} }
} }
} catch (InterruptedException | ExecutionException e) { } catch (InterruptedException | ExecutionException e) {
FineLoggerFactory.getLogger().error(e, e.getMessage()); 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")); uiLabel.setIcon(UIManager.getIcon("OptionPane.errorIcon"));
} }
dialogDownPane.remove(cancelButton); dialogDownPane.remove(cancelButton);
@ -583,7 +583,7 @@ public class RemoteEnvPane extends BasicBeanPane<RemoteDesignerWorkspaceInfo> {
} }
private void initMessageDialog() { 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)); message.setBorder(BorderFactory.createEmptyBorder(8, 5, 0, 0));
okButton.setEnabled(false); okButton.setEnabled(false);

26
designer-base/src/main/java/com/fr/file/FILEChooserPane.java

@ -255,7 +255,7 @@ public class FILEChooserPane extends BasicPane {
centerRightPane.add(fileNamePane, BorderLayout.SOUTH); centerRightPane.add(fileNamePane, BorderLayout.SOUTH);
Component[][] outComponents = new Component[][]{ 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}}; new Component[]{centerLeftPanel, centerRightPane}};
JPanel contentPane = TableLayoutHelper.createTableLayoutPane(outComponents, new double[]{TableLayout.PREFERRED, TableLayout.FILL}, JPanel contentPane = TableLayoutHelper.createTableLayoutPane(outComponents, new double[]{TableLayout.PREFERRED, TableLayout.FILL},
new double[]{TableLayout.PREFERRED, TableLayout.FILL}); new double[]{TableLayout.PREFERRED, TableLayout.FILL});
@ -546,19 +546,19 @@ public class FILEChooserPane extends BasicPane {
EnumSet<FileExtension> fileExtensions = EnumSet.of(FileExtension.CPT, FileExtension.CPTX, FileExtension.FRM, FileExtension.FRMX, FileExtension.CHT); EnumSet<FileExtension> fileExtensions = EnumSet.of(FileExtension.CPT, FileExtension.CPTX, FileExtension.FRM, FileExtension.FRMX, FileExtension.CHT);
if (type == JFileChooser.OPEN_DIALOG) { if (type == JFileChooser.OPEN_DIALOG) {
if (WorkContext.getCurrent().isLocal()) { //本地连接 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 { } 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过滤 // 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.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-Report_Template_File"))); this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.CPTX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
// richer:form文件 daniel 改成三个字 // 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.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-Report_Template_File"))); this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.FRMX, appName + com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Template_File")));
} else { } else {
if (type == JFileChooser.OPEN_DIALOG) { if (type == JFileChooser.OPEN_DIALOG) {
this.addChooseFILEFilter(new ChooseFileFilter(EnumSet.of(FileExtension.XLS, FileExtension.XLSX), com.fr.design.i18n.Toolkit.i18nText("Import-Excel_Source"))); 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"))); this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.XLSX, com.fr.design.i18n.Toolkit.i18nText("Import-Excel2007_Source")));
} }
if (FileExtension.PNG.matchExtension(suffix)) { 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) { if (type == JFileChooser.SAVE_DIALOG) {
this.addChooseFILEFilter(new ChooseFileFilter(FileExtension.PDF, com.fr.design.i18n.Toolkit.i18nText("FR-Import-Export_PDF"))); 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(); saveDictionary();
dialogExit(); dialogExit();
} else { } 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; return;
} }
} }
@ -688,7 +688,7 @@ public class FILEChooserPane extends BasicPane {
FineLoggerFactory.getLogger().error(e.getMessage(), e); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
if (!access) { 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; return;
} }
if (selectedFile.exists()) { if (selectedFile.exists()) {
@ -741,7 +741,7 @@ public class FILEChooserPane extends BasicPane {
* dialog的名字 * dialog的名字
*/ */
private String dialogName() { 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); FineLoggerFactory.getLogger().error(e.getMessage(), e);
} }
if (!access) { 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; return;
} }
@ -1448,4 +1448,4 @@ public class FILEChooserPane extends BasicPane {
folderButton.addActionListener(createFolderActionListener); folderButton.addActionListener(createFolderActionListener);
return folderButton; return folderButton;
} }
} }

5
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.TableLayout;
import com.fr.design.layout.TableLayoutHelper; import com.fr.design.layout.TableLayoutHelper;
import com.fr.general.ComparatorUtils; import com.fr.general.ComparatorUtils;
import com.fr.general.Inter;
import com.fr.plugin.chart.type.ConditionKeyType; import com.fr.plugin.chart.type.ConditionKeyType;
import com.fr.stable.StringUtils; import com.fr.stable.StringUtils;
@ -84,7 +83,7 @@ public class ChartConditionPane extends LiteConditionPane<CommonCondition> {
conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height)); conditionKeyComboBox.setPreferredSize(new Dimension(175, conditionKeyComboBox.getPreferredSize().height));
conditionOPComboBox.setPreferredSize(new Dimension(80, 20)); conditionOPComboBox.setPreferredSize(new Dimension(80, 20));
Component[][] components = { 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}}; new UILabel()}, {conditionKeyComboBox, conditionOPComboBox, conditionValuePane}};
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
@ -147,4 +146,4 @@ public class ChartConditionPane extends LiteConditionPane<CommonCondition> {
} }
} }
} }

4
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; private UIRadioButton outSideButton;
protected JPanel createJPanel4Position() { 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")); insideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelInside"));
outSideButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Chart_DataLabelOutSide")); 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); seriesAttrContents.setPosition(Constants.OUTSIDE);
} }
} }
} }

4
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}; double[] rowSize = { p,p,p,p,p,p};
Component[][] components = new Component[][]{ 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_Width") + ":", SwingConstants.RIGHT), widthField},
new Component[]{new BoldFontTextLabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Height") + ":", SwingConstants.RIGHT), heightField}, 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"); return com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Hyperlink");
} }
} }

4
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); orientationBar = new NumberDragBar(-NUM90, NUM90);
orientationSpinner = new UIBasicSpinner(new SpinnerNumberModel(0, -NUM90, NUM90, 1)); 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); labelSampleChoose = new UIComboBox(sampleType);
customLabelSamleTime = new UITextField(); customLabelSamleTime = new UITextField();
checkCustomSampleField(); checkCustomSampleField();
@ -466,4 +466,4 @@ public class ChartAxisLabelPane extends BasicPane implements UIObserver{
public boolean shouldResponseChangeListener() { public boolean shouldResponseChangeListener() {
return true; return true;
} }
} }

2
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)); selectFilePane.setBorder(BorderFactory.createEmptyBorder(TEN, FIVE, 0, THIRTY));
defaultRadioButton = new UIRadioButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_DEFAULT")); 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(); ButtonGroup buttonGroup = new ButtonGroup();
defaultRadioButton.setSelected(true); defaultRadioButton.setSelected(true);
buttonGroup.add(defaultRadioButton); buttonGroup.add(defaultRadioButton);

6
designer-chart/src/main/java/com/fr/van/chart/DownloadOnlineSourcesHelper.java

@ -79,7 +79,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
public void installOnline() { 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) { if (choose == JOptionPane.OK_OPTION) {
initDialog(); initDialog();
@ -174,7 +174,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
setProgress(0); setProgress(0);
dialog = new JDialog(); 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()); JPanel contentPane = new JPanel(new BorderLayout());
contentPane.add(label, BorderLayout.CENTER); contentPane.add(label, BorderLayout.CENTER);
@ -208,7 +208,7 @@ public class DownloadOnlineSourcesHelper implements DownloadSourcesEvent {
RestartHelper.restart(); RestartHelper.restart();
} }
} else { } 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"));
} }
} }

2
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()); typePane.setBorder(BorderFactory.createEmptyBorder());
return new Component[][]{ return new Component[][]{
new Component[]{null, null}, 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}, new Component[]{null, centerPane},
}; };
} }

4
designer-chart/src/main/java/com/fr/van/chart/designer/style/background/VanChartAlertValuePane.java

@ -119,7 +119,7 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Chart-Layout_Position")),alertTextPosition}, 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("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_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}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Chart-Color_Color")),fontColor},
}; };
@ -200,4 +200,4 @@ public class VanChartAlertValuePane extends BasicBeanPane<VanChartAlertValue> {
} }
return chartAlertValue; return chartAlertValue;
} }
} }

4
designer-chart/src/main/java/com/fr/van/chart/designer/style/datasheet/VanChartDataSheetPane.java

@ -94,7 +94,7 @@ public class VanChartDataSheetPane extends AbstractVanChartScrollPane<Chart> {
double[] columnSize = {d, e}; double[] columnSize = {d, e};
double[] rowSize = {p,p,p}; double[] rowSize = {p,p,p};
Component[][] components = new Component[][]{ 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("FR-Designer-Widget_Style"),textAttrPane),null},
new Component[]{TableLayout4VanChartHelper.createExpandablePaneWithTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Chart_Border"),borderPane),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<Chart> {
} }
} }

2
designer-chart/src/main/java/com/fr/van/chart/structure/desinger/style/StructureNodeStylePane.java

@ -58,7 +58,7 @@ public class StructureNodeStylePane extends BasicBeanPane<AttrNode> {
new Component[]{null, null}, new Component[]{null, null},
new Component[]{jPanel, 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("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} new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Alpha")), nodeOpacity}
}; };

2
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}; double[] rowSize = {p,p,p,p};
JPanel jPanel = new JPanel(new BorderLayout()); 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); linkWidthPane = TableLayout4VanChartHelper.createGapTableLayoutPane(" ", linkWidth);
jPanel.add(linkWidthPane, BorderLayout.CENTER); jPanel.add(linkWidthPane, BorderLayout.CENTER);

4
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)) { if (ComparatorUtils.equals(constraints, BorderLayout.NORTH) || ComparatorUtils.equals(constraints, BorderLayout.SOUTH)) {
int containerHeight = container.getHeight(); int containerHeight = container.getHeight();
if (rectangle.height > containerHeight) { 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; return true;
} }
} else if (ComparatorUtils.equals(constraints, BorderLayout.EAST) || ComparatorUtils.equals(constraints, BorderLayout.WEST)) { } else if (ComparatorUtils.equals(constraints, BorderLayout.EAST) || ComparatorUtils.equals(constraints, BorderLayout.WEST)) {
int containerWidth = container.getWidth(); int containerWidth = container.getWidth();
if (rectangle.width > containerWidth) { 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; return true;
} }
} }

4
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( CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( 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")} WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}
, super.supportedDescriptor()); , super.supportedDescriptor());
CRPropertyDescriptor regErrorMessage = new CRPropertyDescriptor("regErrorMessage", this.data.getClass()).setI18NName( 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}); (CRPropertyDescriptor[]) ArrayUtils.addAll(sup, new CRPropertyDescriptor[]{regex, waterMark});
} }
} }

4
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( CRPropertyDescriptor[] sup = (CRPropertyDescriptor[]) ArrayUtils.addAll(
new CRPropertyDescriptor[]{ new CRPropertyDescriptor[]{
new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( 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()); WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced")}, super.supportedDescriptor());
CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.RegexEditor4TextArea.class) 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() { protected String getIconName() {
return "text_area_16.png"; return "text_area_16.png";
} }
} }

4
designer-form/src/main/java/com/fr/design/designer/creator/XTextEditor.java

@ -42,7 +42,7 @@ public class XTextEditor extends XWrapperedFieldEditor {
@Override @Override
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
CRPropertyDescriptor widgetValue = new CRPropertyDescriptor("widgetValue", this.data.getClass()).setI18NName( 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"); WidgetValueEditor.class).putKeyValue(XCreatorConstants.PROPERTY_CATEGORY, "FR-Designer_Advanced");
CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName( CRPropertyDescriptor regex = new CRPropertyDescriptor("regex", this.data.getClass()).setI18NName(
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Input_Rule")).setEditorClass(RegexEditor.class).putKeyValue( 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"; return "text_field_16.png";
} }
} }

2
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) { public TabMoveEndAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
super(t, 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")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/end.png"));
} }

2
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) { public TabMoveFirstAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
super(t, 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")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/first.png"));
} }

2
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) { public TabMoveNextAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
super(t, 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")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/next.png"));
} }

2
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) { public TabMovePrevAction(FormDesigner t, XCardSwitchButton xCardSwitchButton) {
super(t, 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")); this.setSmallIcon(IOUtils.readIcon("com/fr/design/images/control/tab/prev.png"));
} }

8
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.*;
import com.fr.design.designer.creator.cardlayout.XWCardMainBorderLayout; 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.FormDesigner;
import com.fr.design.mainframe.FormSelectionUtils;
import com.fr.design.mainframe.WidgetPropertyPane; import com.fr.design.mainframe.WidgetPropertyPane;
import com.fr.design.mainframe.widget.editors.LayoutTypeEditor; 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.form.ui.container.WBodyLayoutType;
import com.fr.log.FineLoggerFactory; import com.fr.log.FineLoggerFactory;
import com.fr.general.FRScreen;
import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellEditor;
import javax.swing.table.TableCellRenderer; import javax.swing.table.TableCellRenderer;
import java.awt.*; import java.awt.*;
import java.awt.geom.Arc2D;
import java.util.Arrays; import java.util.Arrays;
import java.util.Comparator; import java.util.Comparator;
@ -73,7 +67,7 @@ public class FRAbsoluteBodyLayoutPropertiesGroupModel extends FRAbsoluteLayoutPr
case 0: case 0:
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type"); return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type");
default: 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 { } else {
switch (row) { switch (row) {

4
designer-form/src/main/java/com/fr/design/designer/properties/FRAbsoluteLayoutPropertiesGroupModel.java

@ -38,7 +38,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel {
*/ */
@Override @Override
public String getGroupName() { 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 @Override
@ -59,7 +59,7 @@ public class FRAbsoluteLayoutPropertiesGroupModel implements GroupModel {
@Override @Override
public Object getValue(int row, int column) { public Object getValue(int row, int column) {
if (column == 0) { 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 { } else {
return layout.getCompState(); return layout.getCompState();
} }

16
designer-form/src/main/java/com/fr/design/designer/properties/FRFitLayoutConstraints.java

@ -47,7 +47,7 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
@Override @Override
public String getGroupName() { 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 @Override
@ -70,9 +70,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
if (column == 0) { if (column == 0) {
switch (row) { switch (row) {
case 0: 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: 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 { } else {
switch (row) { switch (row) {
@ -101,9 +101,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
return false; return false;
} }
if(bounds.width == rec.width - margin.getLeft() - margin.getRight()){ 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){ }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(); v = xCreator.getWidth();
} }
difference = bounds.width - v; difference = bounds.width - v;
@ -114,9 +114,9 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
return false; return false;
} }
if(bounds.height == rec.height - margin.getTop() - margin.getBottom()){ 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){ }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(); v = xCreator.getHeight();
} }
difference = bounds.height - v; difference = bounds.height - v;
@ -158,4 +158,4 @@ public class FRFitLayoutConstraints implements ConstraintsGroupModel {
return true; return true;
} }
} }

6
designer-form/src/main/java/com/fr/design/designer/properties/mobile/BodyAppRelayoutTable.java

@ -1,6 +1,5 @@
package com.fr.design.designer.properties.mobile; package com.fr.design.designer.properties.mobile;
import java.awt.*;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.beans.IntrospectionException; import java.beans.IntrospectionException;
import java.util.ArrayList; import java.util.ArrayList;
@ -8,7 +7,6 @@ import java.util.ArrayList;
import com.fr.base.FRContext; import com.fr.base.FRContext;
import com.fr.design.designer.beans.events.DesignerEvent; import com.fr.design.designer.beans.events.DesignerEvent;
import com.fr.design.designer.creator.*; 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.AbstractPropertyTable;
import com.fr.design.gui.itable.PropertyGroup; import com.fr.design.gui.itable.PropertyGroup;
import com.fr.design.gui.xtable.ReportAppPropertyGroupModel; import com.fr.design.gui.xtable.ReportAppPropertyGroupModel;
@ -32,7 +30,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException { public CRPropertyDescriptor[] supportedDescriptor() throws IntrospectionException {
CRPropertyDescriptor[] propertyTableEditor = { CRPropertyDescriptor[] propertyTableEditor = {
new CRPropertyDescriptor("appRelayout", this.xCreator.toData().getClass()).setEditorClass(InChangeBooleanEditor.class) 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; return propertyTableEditor;
} }
@ -85,4 +83,4 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
public void firePropertyEdit() { public void firePropertyEdit() {
designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED); designer.getEditListenerTable().fireCreatorModified(DesignerEvent.CREATOR_EDITED);
} }
} }

4
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"), 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); 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"), BaseUtils.readIcon("/com/fr/web/images/form/resources/boxlayout_v_16.png"),
WFitLayout.class); 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"), 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); ElementCaseEditor.class);
} }

10
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}; double[] columnSize = { p, f};
JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ 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(""), 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); }, rowSize, columnSize, 10);
rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12));
this.setTitlePane(new UIScrollPane(rightBottomContentPane)); 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); this.getTitlePane().setVisible(false);
return this.getTitlePane(); return this.getTitlePane();
} }
@ -66,7 +66,7 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane {
JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
defaultPane.add(centerPane, BorderLayout.CENTER); 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(); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.add(borderPane, BorderLayout.CENTER); centerPane.add(borderPane, BorderLayout.CENTER);
@ -112,4 +112,4 @@ public class CardTagLayoutBorderPane extends LayoutBorderPane {
protected void populateTitle(){ protected void populateTitle(){
return; return;
} }
} }

62
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 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_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("FR-Designer-Widget-Style_Common"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Shadow")}; 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); 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(); JPanel centerPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
defaultPane.add(centerPane, BorderLayout.CENTER); 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(); JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
centerPane.add(borderPane, BorderLayout.CENTER); centerPane.add(borderPane, BorderLayout.CENTER);
@ -381,23 +381,23 @@ public class LayoutBorderPane extends BasicPane {
double[] columnSize = { p, MAX_WIDTH}; double[] columnSize = { p, MAX_WIDTH};
JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
getBorderTypeComp(), getBorderTypeComp(),
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Render_Style")), borderStyleCombo}, {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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("Fine-Design_Form_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_Border_Color")), buttonPane},
getBorderCornerSpinnerComp(), getBorderCornerSpinnerComp(),
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, {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("FR-Designer-Widget-Style_Alpha"))}, {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
{new UILabel(""),transparencyPane}, {new UILabel(""),transparencyPane},
}, rowSize, columnSize, 10); }, rowSize, columnSize, 10);
rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12));
UIScrollPane rightTopPane = new UIScrollPane(rightTopContentPane); 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()); rightTopPane.setPreferredSize(rightTopPane.getPreferredSize());
return rightTopPane; return rightTopPane;
} }
protected JComponent[] getBorderTypeComp(){ 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(){ protected JComponent[] getBorderCornerSpinnerComp(){
@ -438,14 +438,14 @@ public class LayoutBorderPane extends BasicPane {
double[] rowSize = {p,p,p}; double[] rowSize = {p,p,p};
double[] columnSize = { p, f}; double[] columnSize = { p, f};
JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{ JPanel rightTopContentPane = TableLayoutHelper.createCommonTableLayoutPane(new JComponent[][]{
{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget-Style_Body_Background")), backgroundPane}, {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("FR-Designer-Widget-Style_Alpha"))}, {new UILabel(""),new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget-Style_Alpha"))},
{new UILabel(""),transparencyPane}, {new UILabel(""),transparencyPane},
}, rowSize, columnSize, 10); }, rowSize, columnSize, 10);
rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 6)); rightTopContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 6));
JPanel bodyRightTopPane =FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel bodyRightTopPane =FRGUIPaneFactory.createBorderLayout_S_Pane();
bodyRightTopPane.add(rightTopContentPane,BorderLayout.CENTER); 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; return bodyRightTopPane;
} }
@ -463,8 +463,8 @@ public class LayoutBorderPane extends BasicPane {
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),};
Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};
hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment); hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left")
, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); , 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)); JPanel hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
hPaneContainer.add(hAlignmentPane); hPaneContainer.add(hAlignmentPane);
@ -475,15 +475,15 @@ public class LayoutBorderPane extends BasicPane {
double[] columnSize = { p, MAX_WIDTH}; double[] columnSize = { p, MAX_WIDTH};
JPanel rightBottomContentPane = TableLayoutHelper.createCommonTableLayoutPane( new JComponent[][]{ 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("Fine-Design_Form_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_Format")), fontSizeTypePane},
{new UILabel(""), initFontButtonPane()}, {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_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); }, rowSize, columnSize, 10);
rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12)); rightBottomContentPane.setBorder(BorderFactory.createEmptyBorder(15, 12, 10, 12));
titlePane =new UIScrollPane(rightBottomContentPane); 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); titlePane.setVisible(false);
return titlePane; return titlePane;
} }
@ -520,20 +520,20 @@ public class LayoutBorderPane extends BasicPane {
} }
protected void initAllNames() { protected void initAllNames() {
fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Family")); fontNameComboBox.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Family"));
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")); colorSelectPane.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); italic.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); bold.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); underline.setGlobalName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_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"));
} }
protected void setToolTips() { protected void setToolTips() {
colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Foreground")); colorSelectPane.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Foreground"));
italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); italic.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Bold")); bold.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Bold"));
underline.setToolTipText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Underline")); 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() { protected String title4PopupWindow() {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style"); return com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Style");
} }
} }

4
designer-form/src/main/java/com/fr/design/mainframe/CoverPane.java

@ -42,7 +42,7 @@ public class CoverPane extends JPanel {
setBackground(null); setBackground(null);
setOpaque(false); 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 @Override
public Dimension getPreferredSize() { public Dimension getPreferredSize() {
return new Dimension(60, 24); return new Dimension(60, 24);
@ -130,4 +130,4 @@ public class CoverPane extends JPanel {
protected Rectangle getPaintBorderBounds(){ protected Rectangle getPaintBorderBounds(){
return new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2 , getHeight() - BORDER_WIDTH * 2); return new Rectangle(BORDER_WIDTH, BORDER_WIDTH, getWidth() - BORDER_WIDTH * 2 , getHeight() - BORDER_WIDTH * 2);
} }
} }

5
designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@ -1,6 +1,5 @@
package com.fr.design.mainframe; package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.Parameter; import com.fr.base.Parameter;
import com.fr.base.ScreenResolution; import com.fr.base.ScreenResolution;
import com.fr.base.vcs.DesignerMode; import com.fr.base.vcs.DesignerMode;
@ -358,7 +357,7 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
} }
private void addParaPaneTooltips() { 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); 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<Form> implements TreeSelection
public int getResolution(){ public int getResolution(){
return this.resolution; return this.resolution;
} }
} }

10
designer-form/src/main/java/com/fr/design/mainframe/FormEditToolBar.java

@ -125,12 +125,12 @@ public class FormEditToolBar extends BasicPane {
this.add(splitPane); this.add(splitPane);
list.addListSelectionListener(listSelectionListener); list.addListSelectionListener(listSelectionListener);
JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel backgroundPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
UIButton bgButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Background_Set")); 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("FR-Designer-Output_Default_Background")); defaultCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Default_Background"));
bgButton.addActionListener(actioner); bgButton.addActionListener(actioner);
backgroundPane.add(defaultCheckBox); backgroundPane.add(defaultCheckBox);
backgroundPane.add(bgButton); 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); this.add(backgroundPane, BorderLayout.SOUTH);
} }
@ -369,8 +369,8 @@ public class FormEditToolBar extends BasicPane {
private JPanel getExport() { private JPanel getExport() {
JPanel export = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel export = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
// export.setLayout(new BoxLayout(export, BoxLayout.Y_AXIS)); // export.setLayout(new BoxLayout(export, BoxLayout.Y_AXIS));
excelP = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Page")); excelP = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Output_Excel_Page"));
excelO = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Output_Excel_Simple")); excelO = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Output_Excel_Simple"));
export.add(excelP); export.add(excelP);
export.add(Box.createVerticalStrut(2)); export.add(Box.createVerticalStrut(2));
export.add(excelO); export.add(excelO);

6
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++) { for (int i = 0; i < COMMON_CHAR_NUM; i++) {
chartTypePane.add(new ToolBarButton(loadChartOptions()[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(); jSeparatorChart = createJSeparator();
add(jSeparatorChart); add(jSeparatorChart);
} }
@ -229,7 +229,7 @@ public class FormParaWidgetPane extends JPanel {
for (int i = 0; i < num; i++) { for (int i = 0; i < num; i++) {
widgetPane.add(new ToolBarButton(predifinedwidgeList.get(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()); add(createJSeparator());
} }
@ -443,4 +443,4 @@ public class FormParaWidgetPane extends JPanel {
} }
return chartOptions; return chartOptions;
} }
} }

4
designer-form/src/main/java/com/fr/design/mainframe/FormWidgetDetailPane.java

@ -55,7 +55,7 @@ public class FormWidgetDetailPane extends FormDockView{
private CardLayout card; private CardLayout card;
private static final String REPORT_TAB = com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Report"); 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() { public static FormWidgetDetailPane getInstance() {
if (HOLDER.singleton == null) { if (HOLDER.singleton == null) {
@ -439,4 +439,4 @@ public class FormWidgetDetailPane extends FormDockView{
} }
} }

4
designer-form/src/main/java/com/fr/design/mainframe/JForm.java

@ -647,7 +647,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
}; };
UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Authority_Edit")); UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Authority_Edit"));
uiLabel.setHorizontalAlignment(SwingConstants.CENTER); 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)); uiLabel.setForeground(new Color(150, 150, 150));
panel.add(uiLabel, BorderLayout.CENTER); panel.add(uiLabel, BorderLayout.CENTER);
return panel; return panel;
@ -921,4 +921,4 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
public String route() { public String route() {
return ViewRequestConstants.FORM_VIEW_PATH; return ViewRequestConstants.FORM_VIEW_PATH;
} }
} }

4
designer-form/src/main/java/com/fr/design/mainframe/WidgetPropertyPane.java

@ -66,7 +66,7 @@ public class WidgetPropertyPane extends FormDockView implements BaseWidgetPrope
@Override @Override
protected String title4PopupWindow() { 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() { public Location preferredLocation() {
return Location.WEST_BELOW; return Location.WEST_BELOW;
} }
} }

29
designer-form/src/main/java/com/fr/design/mainframe/widget/editors/PaddingMarginPane.java

@ -3,15 +3,6 @@
*/ */
package com.fr.design.mainframe.widget.editors; 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.BasicDialog;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.design.gui.ilable.UILabel; 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.design.layout.FRGUIPaneFactory;
import com.fr.form.ui.PaddingMargin; 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 * @author richer
@ -38,7 +37,7 @@ public class PaddingMarginPane extends BasicPane {
contentPane = new JPanel(new GridLayout(2, 2, 4, 4)); contentPane = new JPanel(new GridLayout(2, 2, 4, 4));
this.add(contentPane); this.add(contentPane);
JPanel topPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); 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); topSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0);
topPane.add(topSpinner, BorderLayout.CENTER); topPane.add(topSpinner, BorderLayout.CENTER);
UILabel topLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); 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); contentPane.add(topPane);
JPanel leftPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); 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); leftSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0);
leftPane.add(leftSpinner, BorderLayout.CENTER); leftPane.add(leftSpinner, BorderLayout.CENTER);
UILabel leftLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); 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); contentPane.add(leftPane);
JPanel bottomPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); 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); bottomSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0);
bottomPane.add(bottomSpinner, BorderLayout.CENTER); bottomPane.add(bottomSpinner, BorderLayout.CENTER);
UILabel bottomLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); 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); contentPane.add(bottomPane);
JPanel rightPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); 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); rightSpinner = new UISpinner(MIN_VALUE, Integer.MAX_VALUE, 1, 0);
rightPane.add(rightSpinner, BorderLayout.CENTER); rightPane.add(rightSpinner, BorderLayout.CENTER);
UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " "); UILabel rightLabel = new UILabel(" " + com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Indent-Pixel") + " ");
@ -103,7 +102,7 @@ public class PaddingMarginPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { 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) { public void populate(PaddingMargin pm) {
@ -124,4 +123,4 @@ public class PaddingMarginPane extends BasicPane {
pm.setRight((int) rightSpinner.getValue()); pm.setRight((int) rightSpinner.getValue());
return pm; return pm;
} }
} }

6
designer-form/src/main/java/com/fr/design/parameter/RootDesignDefinePane.java

@ -93,8 +93,8 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),};
Integer[] hAlignment = new Integer[]{FormConstants.LEFTPOSITION, FormConstants.CENTERPOSITION, FormConstants.RIGHTPOSITION}; Integer[] hAlignment = new Integer[]{FormConstants.LEFTPOSITION, FormConstants.CENTERPOSITION, FormConstants.RIGHTPOSITION};
hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment); hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left")
, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); , 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 f = TableLayout.FILL;
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double[] rowSize = {p, p, p, p, p}; double[] rowSize = {p, p, p, p, p};
@ -157,4 +157,4 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
return null; return null;
} }
} }

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java

@ -34,7 +34,7 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
text = new UITextField(); text = new UITextField();
fontSizePane = new FontSizeComboPane(); fontSizePane = new FontSizeComboPane();
labelNameTextField = new UITextField(); 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); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL; double f = TableLayout.FILL;
@ -79,4 +79,4 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
box.setLabelName(labelNameTextField.getText()); box.setLabelName(labelNameTextField.getText());
return box; return box;
} }
} }

6
designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@ -55,7 +55,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
waterMarkDictPane = new WaterMarkDictPane(); waterMarkDictPane = new WaterMarkDictPane();
UILabel formatLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format")); UILabel formatLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Engine_Format"));
formatLabel.setVerticalAlignment(SwingConstants.TOP); formatLabel.setVerticalAlignment(SwingConstants.TOP);
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); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel startDateLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FS_Start_Date")); UILabel startDateLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FS_Start_Date"));
startDateLabel.setVerticalAlignment(SwingConstants.TOP); startDateLabel.setVerticalAlignment(SwingConstants.TOP);
@ -91,7 +91,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
private JPanel createFormatPane(UIComboBox formatComboBox, UILabel sampleLabel){ private JPanel createFormatPane(UIComboBox formatComboBox, UILabel sampleLabel){
JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), com.fr.design.i18n.Toolkit.i18nText("FR-Base_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR); TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR);
previewPane.setBorder(titledBorder); previewPane.setBorder(titledBorder);
JPanel sampleLabelWrapper = new JPanel(new BorderLayout()); JPanel sampleLabelWrapper = new JPanel(new BorderLayout());
@ -245,4 +245,4 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
return 0; return 0;
} }
} }

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java

@ -28,7 +28,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
@Override @Override
protected JPanel setFirstContentPane() { protected JPanel setFirstContentPane() {
JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); 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); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null}; Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null};
@ -101,4 +101,4 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
} }
protected abstract T updateSubDirectWriteEditorBean(); protected abstract T updateSubDirectWriteEditorBean();
} }

6
designer-form/src/main/java/com/fr/design/widget/ui/designer/LabelDefinePane.java

@ -54,15 +54,15 @@ public class LabelDefinePane extends AbstractDataModify<Label> {
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),}; BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),};
Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT}; Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};
hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment); hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Left") hAlignmentPane.setAllToolTips(new String[]{com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormStyleAlignment_Left")
, com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-StyleAlignment_Right")}); , com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Center"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_StyleAlignment_Right")});
frFontPane = new FRFontPane(); frFontPane = new FRFontPane();
double f = TableLayout.FILL; double f = TableLayout.FILL;
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
double[] rowSize = {p, p, p, p, p, p, p}; double[] rowSize = {p, p, p, p, p, p, p};
double[] columnSize = {p, f}; double[] columnSize = {p, f};
int[][] rowCount = {{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}}; int[][] rowCount = {{1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
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); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
UILabel fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size")); UILabel fontLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Font-Size"));
fontLabel.setVerticalAlignment(SwingConstants.TOP); fontLabel.setVerticalAlignment(SwingConstants.TOP);

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java

@ -38,7 +38,7 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
protected JPanel setFirstContentPane() { protected JPanel setFirstContentPane() {
// richer:数字的允许直接编辑没有意义 // richer:数字的允许直接编辑没有意义
waterMarkDictPane = new WaterMarkDictPane(); waterMarkDictPane = new WaterMarkDictPane();
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); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL; double f = TableLayout.FILL;
@ -90,4 +90,4 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
return null; return null;
} }
} }

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@ -61,7 +61,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL; double f = TableLayout.FILL;
double p = TableLayout.PREFERRED; double p = TableLayout.PREFERRED;
UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Widget_Value"), SwingConstants.LEFT); UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value"), SwingConstants.LEFT);
widgetValueLabel.setVerticalAlignment(SwingConstants.TOP); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Label_Name")), labelNameTextField},
@ -110,4 +110,4 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
} }
} }

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@ -35,7 +35,7 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel advancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
dictionaryEditor = new AccessibleDictionaryEditor(); dictionaryEditor = new AccessibleDictionaryEditor();
buttonGroupDictPane = new ButtonGroupDictPane(); buttonGroupDictPane = new ButtonGroupDictPane();
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); widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false); formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
double f = TableLayout.FILL; double f = TableLayout.FILL;

8
designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetBoundPane.java

@ -115,11 +115,11 @@ public class WidgetBoundPane extends BasicPane {
PaddingMargin margin = wabs.getMargin(); PaddingMargin margin = wabs.getMargin();
if (bounds.width != w) { if (bounds.width != w) {
if (bounds.width == rec.width - margin.getLeft() - margin.getRight()) { 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"));
width.setValue(bounds.width); width.setValue(bounds.width);
return; return;
} else if (w < minWidth) { } else if (w < 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));
width.setValue(bounds.width); width.setValue(bounds.width);
return; return;
} }
@ -136,11 +136,11 @@ public class WidgetBoundPane extends BasicPane {
int minHeight = (int) (MINHEIGHT * ((WFitLayout) wabs).getResolutionScaling()); int minHeight = (int) (MINHEIGHT * ((WFitLayout) wabs).getResolutionScaling());
if (bounds.height != h) { if (bounds.height != h) {
if (bounds.height == rec.height - margin.getTop() - margin.getBottom()) { 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"));
height.setValue(bounds.height); height.setValue(bounds.height);
return; return;
} else if (h < minHeight) { } else if (h < 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));
height.setValue(bounds.height); height.setValue(bounds.height);
return; return;
} }

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/component/WidgetCardTagBoundPane.java

@ -48,13 +48,13 @@ public class WidgetCardTagBoundPane extends WidgetBoundPane {
Rectangle rectangle = tabLayout.getBounds(); Rectangle rectangle = tabLayout.getBounds();
if(ComparatorUtils.equals(displayPosition, WTabDisplayPosition.TOP_POSITION) || ComparatorUtils.equals(displayPosition, WTabDisplayPosition.BOTTOM_POSITION)){ if(ComparatorUtils.equals(displayPosition, WTabDisplayPosition.TOP_POSITION) || ComparatorUtils.equals(displayPosition, WTabDisplayPosition.BOTTOM_POSITION)){
if(rectangle.height < size){ if(rectangle.height < size){
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; return;
} }
parentBounds.height = size; parentBounds.height = size;
}else{ }else{
if(rectangle.width < size){ if(rectangle.width < size){
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; return;
} }
parentBounds.width = size; parentBounds.width = size;

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteBodyLayoutDefinePane.java

@ -80,7 +80,7 @@ public class FRAbsoluteBodyLayoutDefinePane extends FRAbsoluteLayoutDefinePane {
JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ JPanel northPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type")), layoutCombox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Attr_Layout_Type")), layoutCombox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{ JPanel centerPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode")), comboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode")), comboBox}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
jPanel.add(northPane, BorderLayout.NORTH); jPanel.add(northPane, BorderLayout.NORTH);
jPanel.add(centerPane, BorderLayout.CENTER); jPanel.add(centerPane, BorderLayout.CENTER);
centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0)); centerPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, IntervalConstants.INTERVAL_L5, 0, 0));

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/layout/FRAbsoluteLayoutDefinePane.java

@ -39,7 +39,7 @@ public class FRAbsoluteLayoutDefinePane extends AbstractDataModify<WAbsoluteLayo
JPanel jPanel = createThirdPane(); JPanel jPanel = createThirdPane();
jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); jPanel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
thirdPane.add(jPanel, BorderLayout.CENTER); thirdPane.add(jPanel, BorderLayout.CENTER);
UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Area_Scaling"), 280, 20, thirdPane); UIExpandablePane layoutExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_FormWidget_Area_Scaling"), 280, 20, thirdPane);
this.add(layoutExpandablePane, BorderLayout.CENTER); this.add(layoutExpandablePane, BorderLayout.CENTER);
} }
@ -50,7 +50,7 @@ public class FRAbsoluteLayoutDefinePane extends AbstractDataModify<WAbsoluteLayo
double[] columnSize = {p, f}; double[] columnSize = {p, f};
int[][] rowCount = {{1, 1}}; int[][] rowCount = {{1, 1}};
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Widget_Scaling_Mode")), comboBox}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Widget_Scaling_Mode")), comboBox},
}; };
JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1); JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
// panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); // panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/BodyMobileDefinePane.java

@ -43,7 +43,7 @@ public class BodyMobileDefinePane extends MobileWidgetDefinePane {
// 手机属性 // 手机属性
private UIExpandablePane getMobilePropertyPane() { private UIExpandablePane getMobilePropertyPane() {
JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane(); JPanel panel = FRGUIPaneFactory.createBorderLayout_S_Pane();
appRelayoutCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-App_ReLayout"), true); appRelayoutCheck = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_App_ReLayout"), true);
appRelayoutCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0)); appRelayoutCheck.setBorder(BorderFactory.createEmptyBorder(0, 0, 10, 0));
panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0)); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
panel.add(appRelayoutCheck); panel.add(appRelayoutCheck);

4
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@ -87,7 +87,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
unavailableTipLabel.setText("<html>" + tipText + "<html>"); unavailableTipLabel.setText("<html>" + tipText + "<html>");
unavailableTipLabel.setForeground(Color.gray); unavailableTipLabel.setForeground(Color.gray);
panel.add(unavailableTipLabel, BorderLayout.NORTH); panel.add(unavailableTipLabel, BorderLayout.NORTH);
allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Allow_Full_Screen")); allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
panel.add(allowFullCheckBox); panel.add(allowFullCheckBox);
return panel; return panel;
} }
@ -98,7 +98,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
tipLabel = new UILabel(); tipLabel = new UILabel();
tipLabel.setForeground(Color.gray); tipLabel.setForeground(Color.gray);
updateTipLabel(); updateTipLabel();
allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Allow_Full_Screen")); allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())}, new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())},

2
designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

@ -85,7 +85,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane{
maxHeightSpinner.setVisible(false); maxHeightSpinner.setVisible(false);
maxHeightLabel.setVisible(false); maxHeightLabel.setVisible(false);
allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Allow_Full_Screen")); allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
Component[][] components = new Component[][]{ Component[][] components = new Component[][]{
new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Horizontal"), SwingConstants.LEFT), hComboBox}, new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Mobile-Horizontal"), SwingConstants.LEFT), hComboBox},

11
designer-realize/src/main/java/com/fr/design/actions/cell/EditCellAction.java

@ -3,14 +3,13 @@
*/ */
package com.fr.design.actions.cell; package com.fr.design.actions.cell;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.design.actions.ElementCaseAction; import com.fr.design.actions.ElementCaseAction;
import com.fr.design.mainframe.ElementCasePane; import com.fr.design.mainframe.ElementCasePane;
import java.awt.Toolkit;
import java.awt.event.ActionEvent;
/** /**
* EditCellAction. * EditCellAction.
*/ */
@ -18,7 +17,7 @@ public class EditCellAction extends ElementCaseAction {
public EditCellAction(ElementCasePane t) { public EditCellAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Edit")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit"));
this.setMnemonic('I'); this.setMnemonic('I');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png")); this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/edit.png"));
} }
@ -38,4 +37,4 @@ public class EditCellAction extends ElementCaseAction {
public boolean executeActionReturnUndoRecordNeeded() { public boolean executeActionReturnUndoRecordNeeded() {
return false; return false;
} }
} }

4
designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontItalicAction.java

@ -22,7 +22,7 @@ public class ReportFontItalicAction extends ReportFontBoldAction {
public ReportFontItalicAction(ElementCasePane t) { public ReportFontItalicAction(ElementCasePane t) {
super(t); super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-FRFont_Italic")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_FRFont_Italic"));
this.setSmallIcon(ICONS, true); this.setSmallIcon(ICONS, true);
} }
@ -39,4 +39,4 @@ public class ReportFontItalicAction extends ReportFontBoldAction {
return frFont.isItalic(); return frFont.isItalic();
} }
} }

4
designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java

@ -361,7 +361,7 @@ public class SelectedDataColumnPane extends BasicPane {
private void initVerticalParameterButton() { private void initVerticalParameterButton() {
editorPane = new UITableEditorPane<>(new ParameterTableModel()); editorPane = new UITableEditorPane<>(new ParameterTableModel());
paramButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Basic_Dynamic_Parameter_Injection")); paramButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Dynamic_Parameter_Injection"));
paramButton.addActionListener(new ActionListener() { paramButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
@ -392,4 +392,4 @@ public class SelectedDataColumnPane extends BasicPane {
} }
return new ArrayList<>(); return new ArrayList<>();
} }
} }

44
designer-realize/src/main/java/com/fr/design/headerfooter/HFComponent.java

@ -3,25 +3,6 @@
*/ */
package com.fr.design.headerfooter; package com.fr.design.headerfooter;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import com.fr.base.BaseUtils; import com.fr.base.BaseUtils;
import com.fr.base.headerfooter.DateHFElement; import com.fr.base.headerfooter.DateHFElement;
import com.fr.base.headerfooter.FormulaHFElement; import com.fr.base.headerfooter.FormulaHFElement;
@ -32,11 +13,28 @@ import com.fr.base.headerfooter.NumberOfPageHFElement;
import com.fr.base.headerfooter.PageNumberHFElement; import com.fr.base.headerfooter.PageNumberHFElement;
import com.fr.base.headerfooter.TextHFElement; import com.fr.base.headerfooter.TextHFElement;
import com.fr.base.headerfooter.TimeHFElement; import com.fr.base.headerfooter.TimeHFElement;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.dialog.DialogActionAdapter; import com.fr.design.dialog.DialogActionAdapter;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.imenu.UIMenuItem;
import com.fr.design.utils.gui.GUICoreUtils; import com.fr.design.utils.gui.GUICoreUtils;
import javax.swing.BorderFactory;
import javax.swing.Icon;
import javax.swing.JPopupMenu;
import javax.swing.JSeparator;
import javax.swing.SwingConstants;
import javax.swing.SwingUtilities;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.Color;
import java.awt.Cursor;
import java.awt.Dimension;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
/** /**
* The basic HF edit component. * The basic HF edit component.
*/ */
@ -65,7 +63,7 @@ public class HFComponent extends UILabel implements MoveActionListener {
//popup menu //popup menu
popupMenu = new JPopupMenu(); popupMenu = new JPopupMenu();
UIMenuItem editMenuItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Edit") + "..."); UIMenuItem editMenuItem = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Edit") + "...");
editMenuItem.setMnemonic('E'); editMenuItem.setMnemonic('E');
popupMenu.add(editMenuItem); popupMenu.add(editMenuItem);
@ -303,4 +301,4 @@ public class HFComponent extends UILabel implements MoveActionListener {
return BaseUtils.readIcon("/com/fr/base/images/dialog/headerfooter/undefined.png"); return BaseUtils.readIcon("/com/fr/base/images/dialog/headerfooter/undefined.png");
} }
} }

4
designer-realize/src/main/java/com/fr/design/mainframe/CellWidgetPropertyPane.java

@ -56,7 +56,7 @@ public class CellWidgetPropertyPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { 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");
} }
public void populate(TemplateCellElement cellElement) { public void populate(TemplateCellElement cellElement) {
@ -199,4 +199,4 @@ public class CellWidgetPropertyPane extends BasicPane {
} }
} }

4
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/component/AlphaFineDialog.java

@ -374,7 +374,7 @@ public class AlphaFineDialog extends UIDialog {
*/ */
private void removeLeftPane() { private void removeLeftPane() {
if (searchListModel.isEmpty() && defaultPane == null) { if (searchListModel.isEmpty() && defaultPane == null) {
defaultPane = new NoResultPane(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-AlphaFine_NO_Result"), AlphaFineConstants.IMAGE_URL + "no_result.png"); defaultPane = new NoResultPane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_AlphaFine_NO_Result"), AlphaFineConstants.IMAGE_URL + "no_result.png");
searchResultPane.remove(leftSearchResultPane); searchResultPane.remove(leftSearchResultPane);
searchResultPane.add(defaultPane, BorderLayout.WEST); searchResultPane.add(defaultPane, BorderLayout.WEST);
refreshContainer(); refreshContainer();
@ -1135,4 +1135,4 @@ public class AlphaFineDialog extends UIDialog {
} }
} }
} }

2
designer-realize/src/main/java/com/fr/design/mainframe/alphafine/preview/PluginPreviewPane.java

@ -49,7 +49,7 @@ public class PluginPreviewPane extends JPanel {
nameLabel.setBackground(AlphaFineConstants.BLUE); nameLabel.setBackground(AlphaFineConstants.BLUE);
nameLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 10, 20)); nameLabel.setBorder(BorderFactory.createEmptyBorder(20, 20, 10, 20));
line.setBorder(BorderFactory.createEmptyBorder(20, 0, 10, 0)); line.setBorder(BorderFactory.createEmptyBorder(20, 0, 10, 0));
String price0 = price == 0 ? com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Collect_Information_free") : "¥" + String.valueOf(price); String price0 = price == 0 ? com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Collect_Information_free") : "¥" + String.valueOf(price);
UILabel priceLabel = new UILabel(price0); UILabel priceLabel = new UILabel(price0);
priceLabel.setForeground(AlphaFineConstants.RED); priceLabel.setForeground(AlphaFineConstants.RED);
priceLabel.setFont(AlphaFineConstants.MEDIUM_FONT); priceLabel.setFont(AlphaFineConstants.MEDIUM_FONT);

26
designer-realize/src/main/java/com/fr/design/mainframe/bbs/BBSLoginDialog.java

@ -98,13 +98,13 @@ public class BBSLoginDialog extends UIDialog {
} }
private void initComponents(JPanel contentPane) { private void initComponents(JPanel contentPane) {
this.setTitle(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Login-Title")); this.setTitle(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Login-Title"));
tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Login-Failure-Tip")); tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Login-Failure-Tip"));
userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Account") + ":"); userLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Account") + ":");
passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Password") + ":"); passLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Password") + ":");
nameField = new UITextField(); nameField = new UITextField();
passField = new UIPassWordField(); passField = new UIPassWordField();
loginButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Login")); loginButton = new UIButton(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Login"));
passwordReset = getURLActionLabel(CloudCenter.getInstance().acquireUrlByKind("bbs.reset")); passwordReset = getURLActionLabel(CloudCenter.getInstance().acquireUrlByKind("bbs.reset"));
registerLabel = getURLActionLabel(CloudCenter.getInstance().acquireUrlByKind("bbs.register")); registerLabel = getURLActionLabel(CloudCenter.getInstance().acquireUrlByKind("bbs.register"));
loginButton.addActionListener(new ActionListener() { loginButton.addActionListener(new ActionListener() {
@ -216,19 +216,19 @@ public class BBSLoginDialog extends UIDialog {
// 登录失败 // 登录失败
private void loginFailure() { private void loginFailure() {
setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Login-Failure-Tip")); setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Login-Failure-Tip"));
} }
private void tipForUsernameEmpty() { private void tipForUsernameEmpty() {
setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Username-Empty-Tip")); setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Username_Empty_Tip"));
} }
public void showTipForDownloadPluginWithoutLogin() { public void showTipForDownloadPluginWithoutLogin() {
setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Download-Unlogin-Tip")); setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Download-Unlogin_Tip"));
} }
private void tipForPasswordEmpty() { private void tipForPasswordEmpty() {
setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Password-Empty-Tip")); setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Password_Empty_Tip"));
} }
private void setLoginFailureTxt(String errorTxt) { private void setLoginFailureTxt(String errorTxt) {
@ -240,7 +240,7 @@ public class BBSLoginDialog extends UIDialog {
// 连接失败 // 连接失败
private void connectionFailue() { private void connectionFailue() {
setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Connection-Failure")); setLoginFailureTxt(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Connection_Failure"));
} }
/** /**
@ -304,9 +304,9 @@ public class BBSLoginDialog extends UIDialog {
private BoxCenterAligmentPane getURLActionLabel(final String url) { private BoxCenterAligmentPane getURLActionLabel(final String url) {
ActionLabel actionLabel = new ActionLabel(url); ActionLabel actionLabel = new ActionLabel(url);
if (ComparatorUtils.equals(url, CloudCenter.getInstance().acquireUrlByKind("bbs.reset"))) { if (ComparatorUtils.equals(url, CloudCenter.getInstance().acquireUrlByKind("bbs.reset"))) {
actionLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Forgot-Password")); actionLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Forgot-Password"));
} else { } else {
actionLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Register-Account")); actionLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Register_Account"));
} }
actionLabel.addActionListener(new ActionListener() { actionLabel.addActionListener(new ActionListener() {
@ -349,4 +349,4 @@ public class BBSLoginDialog extends UIDialog {
} }
} }
} }
} }

4
designer-realize/src/main/java/com/fr/design/mainframe/bbs/ExitLabel.java

@ -45,7 +45,7 @@ public class ExitLabel extends UILabel{
menu.setOnlyText(true); menu.setOnlyText(true);
menu.setPopupSize(infoPane.getWidth(),infoPane.getHeight()); menu.setPopupSize(infoPane.getWidth(),infoPane.getHeight());
UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Switch-Account")); UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Switch_Account"));
closeOther.addMouseListener(new MouseAdapter() { closeOther.addMouseListener(new MouseAdapter() {
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
@ -78,4 +78,4 @@ public class ExitLabel extends UILabel{
loginDialog.setVisible(true); loginDialog.setVisible(true);
} }
}; };
} }

4
designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoLabel.java

@ -87,7 +87,7 @@ public class UserInfoLabel extends UILabel {
menu.setPopupSize(userInfoPane.getWidth(), userInfoPane.getHeight() * 3); menu.setPopupSize(userInfoPane.getWidth(), userInfoPane.getHeight() * 3);
//私人消息 //私人消息
UIMenuItem priviteMessage = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Privite-Message")); UIMenuItem priviteMessage = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Privite_Message"));
priviteMessage.addMouseListener(new MouseAdapter() { priviteMessage.addMouseListener(new MouseAdapter() {
@Override @Override
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {
@ -103,7 +103,7 @@ public class UserInfoLabel extends UILabel {
}); });
//切换账号 //切换账号
UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-BBSLogin_Switch-Account")); UIMenuItem closeOther = new UIMenuItem(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_BBSLogin_Switch_Account"));
closeOther.addMouseListener(new MouseAdapter() { closeOther.addMouseListener(new MouseAdapter() {
@Override @Override
public void mousePressed(MouseEvent e) { public void mousePressed(MouseEvent e) {

4
designer-realize/src/main/java/com/fr/design/mainframe/bbs/UserInfoPane.java

@ -87,7 +87,7 @@ public class UserInfoPane extends BasicPane {
* 标志未登录状态, 面板设置为灰色 * 标志未登录状态, 面板设置为灰色
*/ */
public void markUnSignIn() { public void markUnSignIn() {
this.userInfoLabel.setText(com.fr.design.i18n.Toolkit.i18nText("FR-Base_UnSignIn")); this.userInfoLabel.setText(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Base_UnSignIn"));
this.userInfoLabel.setOpaque(true); this.userInfoLabel.setOpaque(true);
this.userInfoLabel.setBackground(UN_LOGIN_BACKGROUND); this.userInfoLabel.setBackground(UN_LOGIN_BACKGROUND);
this.userInfoLabel.resetUserName(); this.userInfoLabel.resetUserName();
@ -188,4 +188,4 @@ public class UserInfoPane extends BasicPane {
} }
} }

4
designer-realize/src/main/java/com/fr/design/mainframe/cell/settingpane/CellOtherSetPane.java

@ -130,7 +130,7 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
private JPanel seniorPane() { private JPanel seniorPane() {
// 插入行策略 // 插入行策略
insertRowPolicy = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CellWrite_InsertRow_NULL"), com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Estate_Default_Text"), insertRowPolicy = new UIButtonGroup(new String[]{com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CellWrite_InsertRow_NULL"), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Estate_Default_Text"),
com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CellWrite_InsertRow_COPY")}); com.fr.design.i18n.Toolkit.i18nText("FR-Designer_CellWrite_InsertRow_COPY")});
defaultValuePane = new JPanel(new BorderLayout(4, 0)); defaultValuePane = new JPanel(new BorderLayout(4, 0));
valueEditor = ValueEditorPaneFactory.createBasicValueEditorPane(); valueEditor = ValueEditorPaneFactory.createBasicValueEditorPane();
@ -547,4 +547,4 @@ public class CellOtherSetPane extends AbstractCellAttrPane {
return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource_Other_Attributes"); return com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Datasource_Other_Attributes");
} }
} }

3
designer-realize/src/main/java/com/fr/design/mainframe/socketio/DesignerSocketIO.java

@ -15,7 +15,6 @@ import com.fr.third.guava.base.Optional;
import com.fr.workspace.WorkContext; import com.fr.workspace.WorkContext;
import com.fr.workspace.Workspace; import com.fr.workspace.Workspace;
import com.fr.workspace.base.WorkspaceConstants; import com.fr.workspace.base.WorkspaceConstants;
import com.fr.workspace.engine.connector.FineWorkspaceConnector;
import com.fr.workspace.engine.server.rpc.netty.RemoteCallClient; import com.fr.workspace.engine.server.rpc.netty.RemoteCallClient;
import com.fr.workspace.server.socket.SocketInfoOperator; import com.fr.workspace.server.socket.SocketInfoOperator;
import io.socket.client.IO; import io.socket.client.IO;
@ -81,7 +80,7 @@ public class DesignerSocketIO {
@Override @Override
public void call(Object... objects) { public void call(Object... objects) {
if (status != Status.Disconnecting) { if (status != Status.Disconnecting) {
JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Designer_Basic_Remote_Disconnected"), JOptionPane.showMessageDialog(DesignerContext.getDesignerFrame(), com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Remote_Disconnected"),
null, 0, UIManager.getIcon("OptionPane.errorIcon")); null, 0, UIManager.getIcon("OptionPane.errorIcon"));
TemplatePane.getInstance().editItems(); TemplatePane.getInstance().editItems();
} }

6
designer-realize/src/main/java/com/fr/design/present/BarCodePane.java

@ -144,14 +144,14 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
barWidthContainer.add(barWidthSpinner); barWidthContainer.add(barWidthSpinner);
JPanel barHeightContainer = new JPanel(new BorderLayout()); JPanel barHeightContainer = new JPanel(new BorderLayout());
barHeightContainer.add(barHeightSpinner); barHeightContainer.add(barHeightSpinner);
UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"), UILabel.RIGHT); UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"), UILabel.RIGHT);
uiLabel.setPreferredSize(typeSetLabel.getPreferredSize()); uiLabel.setPreferredSize(typeSetLabel.getPreferredSize());
JPanel drawingTextCheckBoxPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane(); JPanel drawingTextCheckBoxPane = FRGUIPaneFactory.createLeftFlowZeroGapBorderPane();
drawingTextCheckBox.setBorder(UIConstants.CELL_ATTR_ZEROBORDER); drawingTextCheckBox.setBorder(UIConstants.CELL_ATTR_ZEROBORDER);
drawingTextCheckBoxPane.add(drawingTextCheckBox); drawingTextCheckBoxPane.add(drawingTextCheckBox);
Component[][] components_normal = new Component[][]{ Component[][] components_normal = new Component[][]{
new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Barcode_Size"), UILabel.LEFT), barWidthContainer, barHeightContainer}, new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer_Barcode_Size"), UILabel.LEFT), barWidthContainer, barHeightContainer},
new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Width"), UILabel.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("FR-Designer-Tree_Height"), UILabel.CENTER)}, new Component[]{null, new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Width"), UILabel.CENTER), new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Tree_Height"), UILabel.CENTER)},
new Component[]{drawingTextCheckBoxPane, null, null} new Component[]{drawingTextCheckBoxPane, null, null}
}; };
@ -374,4 +374,4 @@ public class BarCodePane extends FurtherBasicBeanPane<BarcodePresent> {
public boolean accept(Object ob) { public boolean accept(Object ob) {
return ob instanceof BarcodePresent; return ob instanceof BarcodePresent;
} }
} }

4
designer-realize/src/main/java/com/fr/design/present/CellWriteAttrPane.java

@ -64,7 +64,7 @@ public class CellWriteAttrPane extends BasicPane {
@Override @Override
protected String title4PopupWindow() { 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");
} }
public void populate(TemplateCellElement cellElement) { public void populate(TemplateCellElement cellElement) {
@ -124,4 +124,4 @@ public class CellWriteAttrPane extends BasicPane {
this.cellEditorDefPane.checkValid(); this.cellEditorDefPane.checkValid();
} }
} }

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save