Entropy
/
design
forked from fanruan/design
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

REPORT-3348 提示信息及其国际化

master
yaoh.wu 7 years ago
parent
ec21f2e967
commit
bb4e3ce6de
7 changed files with 50 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
  2. 5
      designer_base/src/com/fr/design/locale/designer.properties
  3. 3
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  4. 5
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  5. 5
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  6. 5
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  7. 3
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties

50
designer/src/com/fr/quickeditor/cellquick/CellDSColumnEditor.java
Unescape View File

@ -18,6 +18,7 @@ import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.ibutton.UIHeadGroup;
import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.gui.ilable.MultilineLabel;
import com.fr.design.gui.ilable.UILabel;
import com.fr.design.gui.ispinner.UISpinner;
import com.fr.design.gui.itextfield.UITextField;
@ -54,6 +55,7 @@ import java.util.ArrayList;
public class CellDSColumnEditor extends CellQuickEditor {
private static final double P = TableLayout.PREFERRED, F = TableLayout.FILL;
private static final Color TIP_FONT_COLOR = new Color(51f, 51f, 52f, 1.0f);
private enum FilterType {
//前N个 后N个 奇数 偶数 自定义 未定义
@ -604,7 +606,7 @@ public class CellDSColumnEditor extends CellQuickEditor {
if (noContent) {
centerPane.setPreferredSize(new Dimension(0, 0));
} else {
centerPane.setPreferredSize(new Dimension(155, 20));
centerPane.setPreferredSize(new Dimension(158, 20));
}
String sortFormula = dSColumn.getSortFormula();
if (sortFormula != null && sortFormula.length() >= 1) {
@ -678,14 +680,14 @@ public class CellDSColumnEditor extends CellQuickEditor {
setCardPaneLayout.show(setCardPane, FilterType.TOP.name());
tipCardPaneLayout.show(tipCardPane, FilterType.TOP.name());
//隐藏tip 显示set
setCardPane.setPreferredSize(new Dimension(155, 20));
setCardPane.setPreferredSize(new Dimension(158, 20));
tipCardPane.setPreferredSize(new Dimension(0, 0));
} else if (selectIndex == 2) {
//后N个
setCardPaneLayout.show(setCardPane, FilterType.BOTTOM.name());
tipCardPaneLayout.show(tipCardPane, FilterType.BOTTOM.name());
//隐藏tip 显示set
setCardPane.setPreferredSize(new Dimension(155, 20));
setCardPane.setPreferredSize(new Dimension(158, 20));
tipCardPane.setPreferredSize(new Dimension(0, 0));
} else if (selectIndex == 3) {
//奇数
@ -693,19 +695,19 @@ public class CellDSColumnEditor extends CellQuickEditor {
tipCardPaneLayout.show(tipCardPane, FilterType.ODD.name());
//隐藏set 显示tip
setCardPane.setPreferredSize(new Dimension(0, 0));
tipCardPane.setPreferredSize(new Dimension(221, 15));
tipCardPane.setPreferredSize(new Dimension(224, 40));
} else if (selectIndex == 4) {
setCardPaneLayout.show(setCardPane, FilterType.EVEN.name());
tipCardPaneLayout.show(tipCardPane, FilterType.EVEN.name());
//隐藏set 显示tip
setCardPane.setPreferredSize(new Dimension(0, 0));
tipCardPane.setPreferredSize(new Dimension(221, 15));
tipCardPane.setPreferredSize(new Dimension(224, 40));
} else if (selectIndex == 5) {
setCardPaneLayout.show(setCardPane, FilterType.SPECIFY.name());
tipCardPaneLayout.show(tipCardPane, FilterType.SPECIFY.name());
//显示set和tip
setCardPane.setPreferredSize(new Dimension(155, 20));
tipCardPane.setPreferredSize(new Dimension(221, 15));
setCardPane.setPreferredSize(new Dimension(158, 20));
tipCardPane.setPreferredSize(new Dimension(224, 40));
} else {
setCardPaneLayout.show(setCardPane, FilterType.UNDEFINE.name());
tipCardPaneLayout.show(tipCardPane, FilterType.UNDEFINE.name());
@ -713,7 +715,10 @@ public class CellDSColumnEditor extends CellQuickEditor {
setCardPane.setPreferredSize(new Dimension(0, 0));
tipCardPane.setPreferredSize(new Dimension(0, 0));
}
setCardPane.revalidate();
tipCardPane.revalidate();
setCardPane.repaint();
tipCardPane.repaint();
}
});
//配置展示CardLayout
@ -737,22 +742,23 @@ public class CellDSColumnEditor extends CellQuickEditor {
//奇数 UILabel 占一行作为提示信息
setCardPane.add(new JPanel(), FilterType.ODD.name());
tipCardPane.add(new UILabel(Inter.getLocText("BindColumn-Result_Serial_Number_Start_From_1")
+ "," + Inter.getLocText("BindColumn-Odd_Selected_(1,3,5...)")), FilterType.ODD.name());
MultilineLabel oddTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Odd_Tip"));
oddTip.setForeground(TIP_FONT_COLOR);
tipCardPane.add(oddTip, FilterType.ODD.name());
//偶数 UILabel 占一行作为提示信息
setCardPane.add(new JPanel(), FilterType.EVEN.name());
tipCardPane.add(new UILabel(Inter.getLocText("BindColumn-Result_Serial_Number_Start_From_1")
+ "," + Inter.getLocText("BindColumn-Even_Selected_(2,4,6...)")), FilterType.EVEN.name());
MultilineLabel evenTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Even_Tip"));
evenTip.setForeground(TIP_FONT_COLOR);
tipCardPane.add(evenTip, FilterType.EVEN.name());
//输入框占用右半边，提示信息占一行
serialTextField = new UITextField(16);
setCardPane.add(serialTextField, FilterType.SPECIFY.name());
tipCardPane.add(new UILabel(
Inter.getLocText(new String[]{
"Format", "BindColumn-Result_Serial_Number_Start_From_1", "Inner_Parameter", "Group_Count"},
new String[]{": 1,2-3,5,8 ", ",", "$__count__"})), FilterType.SPECIFY.name());
MultilineLabel specifyTip = new MultilineLabel(Inter.getLocText("FS-Designer_DS_Filter_Specify_Tip"));
specifyTip.setForeground(TIP_FONT_COLOR);
tipCardPane.add(specifyTip, FilterType.SPECIFY.name());
this.add(TableLayoutHelper.createTableLayoutPane(new Component[][]{
{filterLabel, rsComboBox},
@ -776,30 +782,30 @@ public class CellDSColumnEditor extends CellQuickEditor {
case SelectCount.TOP:
this.topFormulaPane.populate(selectCount.getFormulaCount());
//隐藏tip 显示set
setCardPane.setPreferredSize(new Dimension(155, 20));
setCardPane.setPreferredSize(new Dimension(158, 20));
tipCardPane.setPreferredSize(new Dimension(0, 0));
break;
case SelectCount.BOTTOM:
this.bottomFormulaPane.populate(selectCount.getFormulaCount());
//隐藏tip 显示set
setCardPane.setPreferredSize(new Dimension(155, 20));
setCardPane.setPreferredSize(new Dimension(158, 20));
tipCardPane.setPreferredSize(new Dimension(0, 0));
break;
case SelectCount.SPECIFY:
this.serialTextField.setText(selectCount.getSerial());
//显示set和tip
setCardPane.setPreferredSize(new Dimension(155, 20));
tipCardPane.setPreferredSize(new Dimension(221, 15));
setCardPane.setPreferredSize(new Dimension(158, 20));
tipCardPane.setPreferredSize(new Dimension(224, 40));
break;
case SelectCount.EVEN:
//隐藏set 显示tip
setCardPane.setPreferredSize(new Dimension(0, 0));
tipCardPane.setPreferredSize(new Dimension(221, 15));
tipCardPane.setPreferredSize(new Dimension(224, 40));
break;
case SelectCount.ODD:
//隐藏set 显示tip
setCardPane.setPreferredSize(new Dimension(0, 0));
tipCardPane.setPreferredSize(new Dimension(221, 15));
tipCardPane.setPreferredSize(new Dimension(224, 40));
break;
default:
//隐藏set和tip

5
designer_base/src/com/fr/design/locale/designer.properties
Unescape View File

@ -2119,4 +2119,7 @@ FR-Designer_Widget_Return_Path=return path
FR-Designer_Widget_Display_Position=Display Position
FR-Designer_Size_Limit=Size_Limit
FR-Designer_Widget_Name=Widget Name
FR-Designer_Coords_And_Size=Coords & Size
FR-Designer_Coords_And_Size=Coords & Size
FS-Designer_DS_Filter_Odd_Tip=\
FS-Designer_DS_Filter_Even_Tip=\
FS-Designer_DS_Filter_Specify_Tip=\

3
designer_base/src/com/fr/design/locale/designer_en_US.properties
Unescape View File

@ -2116,3 +2116,6 @@ FR-Designer_Widget_Display_Position=Display Position
FR-Designer_Size_Limit=Size_Limit
FR-Designer_Widget_Name=Widget Name
FR-Designer_Coords_And_Size=Coords & Size
FS-Designer_DS_Filter_Odd_Tip=\
FS-Designer_DS_Filter_Even_Tip=\
FS-Designer_DS_Filter_Specify_Tip=\

5
designer_base/src/com/fr/design/locale/designer_ja_JP.properties
Unescape View File

@ -2118,4 +2118,7 @@ FR-Designer_Widget_Return_Path=
FR-Designer_Widget_Display_Position=
FR-Designer_Size_Limit=
FR-Designer_Widget_Name=
FR-Designer_Coords_And_Size=
FR-Designer_Coords_And_Size=
FS-Designer_DS_Filter_Odd_Tip=\
FS-Designer_DS_Filter_Even_Tip=\
FS-Designer_DS_Filter_Specify_Tip=\

5
designer_base/src/com/fr/design/locale/designer_ko_KR.properties
Unescape View File

@ -2118,4 +2118,7 @@ FR-Designer_Widget_Return_Path=
FR-Designer_Widget_Display_Position=
FR-Designer_Size_Limit=
FR-Designer_Widget_Name=
FR-Designer_Coords_And_Size=
FR-Designer_Coords_And_Size=
FS-Designer_DS_Filter_Odd_Tip=\
FS-Designer_DS_Filter_Even_Tip=\
FS-Designer_DS_Filter_Specify_Tip=\

5
designer_base/src/com/fr/design/locale/designer_zh_CN.properties
Unescape View File

@ -2126,4 +2126,7 @@ FR-Designer_Widget_Return_Path=\u7ED3\u679C\u8FD4\u56DE\u5B8C\u6574\u5C42\u6B21\
FR-Designer_Widget_Display_Position=\u663E\u793A\u4F4D\u7F6E
FR-Designer_Size_Limit=\u5927\u5C0F\u9650\u5236
FR-Designer_Widget_Name=\u63A7\u4EF6\u540D\u79F0
FR-Designer_Coords_And_Size=\u5750\u6807\u00B7\u5C3A\u5BF8
FR-Designer_Coords_And_Size=\u5750\u6807\u00B7\u5C3A\u5BF8
FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5947\u6570\u96C6(1,3,5...)
FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u9009\u62E9\u4E86\u5076\u6570\u96C6(2,4,6...)
FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u4E3A1,2-3,5,8\uFF0C\u5E8F\u53F7\u4ECE1\u5F00\u59CB\uFF0C\u5185\u503C\u53C2\u6570$_count_\u8868\u793A\u603B\u4E2A\u6570

3
designer_base/src/com/fr/design/locale/designer_zh_TW.properties
Unescape View File

@ -2119,3 +2119,6 @@ FR-Designer_Widget_Display_Position=
FR-Designer_Size_Limit=
FR-Designer_Widget_Name=
FR-Designer_Coords_And_Size=
FS-Designer_DS_Filter_Odd_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5947\u6578\u96C6(1,3,5...)
FS-Designer_DS_Filter_Even_Tip=\u63D0\u793A\uFF1A\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u9078\u64C7\u4E86\u5076\u6578\u96C6(2,4,6...)
FS-Designer_DS_Filter_Specify_Tip=\u63D0\u793A\uFF1A\u683C\u5F0F\u70BA1,2-3,5,8\uFF0C\u5E8F\u865F\u5F9E1\u958B\u59CB\uFF0C\u5185\u7F6E\u53C3\u6578$_count_\u8868\u793A\u7E02\u500B\u6578

Write Preview
Loading…
Cancel
Save