Browse Source

Merge branch 'release' of http://www.finedevelop.com:2015/scm/~kerry/design into release

master
kerry 8 years ago
parent
commit
eb1e45d12a
  1. 8
      designer_base/src/com/fr/design/locale/designer.properties
  2. 7
      designer_base/src/com/fr/design/locale/designer_en_US.properties
  3. 28
      designer_base/src/com/fr/design/locale/designer_ja_JP.properties
  4. 40
      designer_base/src/com/fr/design/locale/designer_ko_KR.properties
  5. 2
      designer_base/src/com/fr/design/locale/designer_zh_CN.properties
  6. 15
      designer_base/src/com/fr/design/locale/designer_zh_TW.properties
  7. 44
      designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java
  8. 19
      designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java

8
designer_base/src/com/fr/design/locale/designer.properties

@ -590,4 +590,10 @@ FR-Designer_Logarithmic=Logarithmic
FR-Designer_Chart_Log_Base=Log Base
FR-Designer_Chart_F_Radar_Axis=Chart_F_Radar_Axis
FR-Designer_Too_Large_To_Paste=too large to paste
FR-Designer_Too_Small_To_Paste=Too small to paste
FR-Designer_Too_Small_To_Paste=Too small to paste
FR-Designer_Validate=
FR-Designer_Get-CubeGetting cube=
FR-Designer_Get-CubeGetting=
FR-Designer_Fit=
FR-Designer_Properties_Mobile=
FR-Designer_Oracle=

7
designer_base/src/com/fr/design/locale/designer_en_US.properties

@ -591,4 +591,9 @@ FR-Designer_Logarithmic=Log scale
FR-Designer_Chart_Log_Base=Log Base
FR-Designer_Chart_F_Radar_Axis=Value Axis
FR-Designer_Too_Large_To_Paste=Too large to paste!
FR-Designer_Too_Small_To_Paste=Too small to paste!
FR-Designer_Too_Small_To_Paste=Too small to paste!
FR-Designer_SimpleCross_Report=
FR-Designer_Get-Cube=
FR-Designer_DoubleLayer_Report=
FR-Designer_Get-CubeGetting=
FR-Designer_SimpleDetail_Report=

28
designer_base/src/com/fr/design/locale/designer_ja_JP.properties

@ -567,4 +567,30 @@ FR-Designer_Logarithmic=\u5BFE\u6570\u76EE\u76DB\u308A
FR-Designer_Chart_Log_Base=\u5E95\u6570
FR-Designer_Chart_F_Radar_Axis=\u5782\u76F4\u8EF8
FR-Designer_Too_Large_To_Paste=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B5\u30A4\u30BA\u306F\u30DC\u30FC\u30C0\u30FC\u306B\u8D85\u3048\u305F\u306E\u3067\u3001\u8CBC\u308A\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\uFF01
FR-Designer_Too_Small_To_Paste=\u8A72\u5F53\u51E6\u306B\u8CBC\u308A\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3001\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B5\u30A4\u30BA\u306F\u9AD8\u3059\u304E\uFF01
FR-Designer_Too_Small_To_Paste=\u8A72\u5F53\u51E6\u306B\u8CBC\u308A\u4ED8\u3051\u3067\u304D\u307E\u305B\u3093\u3001\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u306E\u30B5\u30A4\u30BA\u306F\u9AD8\u3059\u304E\uFF01
FR-Designer_DoubleLayer_Report=\u4E8C\u968E\u30BF\u30A4\u30C8\u30EB
FR-Designer_Printer_Native_Button=\u30ED\u30FC\u30AB\u30EB\u5370\u5237
FR-Designer_Mobile-Warning=\u6700\u5927\u306E\u9AD8\u3055\u306F\u8868\u793A\u30A8\u30EA\u30A2\u306E80\uFF05\u4EE5\u4E0A\u306B\u306A\u308A\u307E\u305B\u3093
FR-Designer_Form-Fit-Tip=\u81EA\u5DF1\u9069\u5FDC\u30D7\u30E9\u30B0\u30A4\u30F3
FR-Designer_Form-Forzen-Speed=\u3001\u305D\u3057\u3066\u6A2A\u65B9\u5411\u81EA\u5DF1\u9069\u5FDC\u307E\u305F\u306F2\u65B9\u5411\u81EA\u52D5\u9069\u5FDC\u3092\u5229\u7528\u3057\u3001\u5E33\u7968\u8868\u793A\u306E\u30B9\u30D4\u30FC\u30C9\u3092\u4E0A\u3052\u3067\u304D\u307E\u3059\u3002
FR-Designer_Mobile_Form_Analysis_Annotation=\u8AAC\u660E\:\u8A72\u5F53\u8A2D\u5B9A\u3088\u308A\u3001\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u306E\u30A2\u30D7\u30EA\u3067\u306E\u89E3\u6790\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3002
FR-Designer_TableData-Default-Para=\u30C7\u30FC\u30BF\u30BB\u30C3\u30C8\u306E\u30C7\u30D5\u30A9\u30EB\u30C8\u30D1\u30E9\u30E1\u30FC\u30BF
FR-Designer-Selected_Widget=\u5F53\u306E\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8
FR-Designer_Plugin_Should_Update_Please_Contact_Developer=\u30D7\u30E9\u30B0\u30A4\u30F3\u306E\u30D0\u30FC\u30B8\u30E7\u30F3\u306F\u4F4E\u3044\u3067\u3059\u304C\u3001\u4E0D\u5177\u5408\u304C\u3067\u3063\u305F\u3001\u958B\u767A\u8005\u3068\u9023\u7D61\u3057\u3066\u304F\u3060\u3055\u3044\u3002
FR-Designer_SimpleCross_Report=\u7C21\u5358\u30AF\u30ED\u30FC\u30B9\u8868
FR-Designer_Button-Cancel=\u53D6\u308A\u6D88\u3057
FR-Designer_Delete_Template=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u524A\u9664
FR-Designer_Install_Template=\u30B3\u30F3\u30DD\u30FC\u30CD\u30F3\u30C8\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB
FR-Designer_SimpleDetail_Report=\u7C21\u5358\u660E\u7D30\u8868
FR-Designer_LocalWidget=\u30ED\u30FC\u30AB\u30EB\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u30E9\u30A4\u30D6\u30E9\u30EA
FR-Designer_WidgetOrder=\u30A6\u30A3\u30B8\u30A7\u30C3\u30C8\u306E\u9806\u756A
FR-Designer_Form-Frozen-Tip=\u30D5\u30EA\u30FC\u30BA\u3092\u4F7F\u3046\u6642\u3001\u5F8C\u8A18\u306E\u30D7\u30E9\u30B0\u30A4\u30F3\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066\u304F\u3060\u3055\u3044\uFF1A
FR-Designer-Invalid_Page_Number=\u7121\u52B9\u306A\u30DA\u30FC\u30B8\u756A\u53F7
FR-Designer_Reset=\u30EA\u30BB\u30C3\u30C8
FR-Designer-Plugin_Please_Update_Jar=jar\u30D1\u30C3\u30AF\u3092\u30A2\u30C3\u30D7\u30C7\u30FC\u30C8\u3057\u3066\u304F\u3060\u3055\u3044
FR-Designer_Get-CubeGetting cube=
FR-Designer_Mobile_Report_Analysis_Annotation=\u8AAC\u660E\:\u8A72\u5F53\u5C5E\u6027\u3088\u308A\u3001\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u306E\u30A2\u30D7\u30EA\u3067\u306E\u89E3\u6790\u30E2\u30FC\u30C9\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u3001\u9801\u5206\u3051\u30D7\u30EC\u30D3\u30E5\u30FC\u3060\u3051\u3092\u652F\u6301\u3001\u66F8\u304D\u8FBC\u307F\u306B\u8A2D\u5B9A\u3059\u308B\u6642\u7121\u52B9\u306B\u306A\u308A\u307E\u3059\u3002
FR-Designer_Properties_Mobile=\u30B9\u30DE\u30FC\u30C8\u30D5\u30A9\u30F3\u5C5E\u6027
FR-Designer_Button-OK=\u5206\u304B\u308A\u307E\u3057\u305F
FR-Designer_Allow-Blank=\u7A7A\u306B\u8A31\u3059
FR-Designer_AllCategories=\u5168\u3066\u306E\u7A2E\u985E

40
designer_base/src/com/fr/design/locale/designer_ko_KR.properties

@ -556,4 +556,42 @@ FR-Designer-Move_Tab_Prev=
FR-Designer_AxisReversed=\uCD95\uC5ED\uC21C
FR-Designer_Logarithmic=\uB85C\uADF8\uB208\uAE08
FR-Designer_Chart_Log_Base=\uAE30\uC218
FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95
FR-Designer_Chart_F_Radar_Axis=\uAC12\uCD95
FR-Designer_COMMUNITY_VIDEO=
FR-Designer_DoubleLayer_Report=
FR-Designer_Too_Small_To_Paste=
FR-Designer_formDesignerModule=
FR-Designer_Mobile-Warning=
FR-Designer_Mobile-Open=
FR-Designer_Form-Fit-Tip=
FR-Designer_Form-Forzen-Speed=
FR-Designer_Mobile_Form_Analysis_Annotation=
FR-Designer_Too_Large_To_Paste=
FR-Designer_COMMUNITY_HELP=
FR-Designer_Validate=
FR-Designer_Button-Cancel=
FR-Designer_Plugin_Should_Update_Please_Contact_Developer=
FR-Designer_COMMUNITY_QUESTIONS=
FR-Designer_SimpleCross_Report=
FR-Designer_COMMUNITY_NEED=
FR-Designer_Delete_Template=
FR-Designer_TableData-Default-Para=
FR-Designer_Allow-Blank=
FR-Designer_LocalWidget=
FR-Designer_WidgetOrder=
FR-Designer_Form-Frozen-Tip=
FR-Designer_Mobile-Horizontal=
FR-Designer-Invalid_Page_Number=
FR-Designer_COMMUNITY_BBS=
FR-Designer_COMMUNITY_SIGN=
FR-Designer_COMMUNITY_UPDATE=
FR-Designer_Mobile-Vertical=
FR-Designer_Get-CubeGetting cube=
FR-Designer_COMMUNITY=
FR-Designer_Mobile_Report_Analysis_Annotation=
FR-Designer_Properties_Mobile=
FR-Designer_Button-OK=
FR-Designer_COMMUNITY_BUG=
FR-Designer_AllCategories=
FR-Designer_Mobile-Attr=
FR-Designer_Mobile-Zoom=

2
designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@ -596,3 +596,5 @@ FR-Designer_Chart_Log_Base=\u5E95\u6570
FR-Designer_Chart_F_Radar_Axis=\u503C\u8F74
FR-Designer_Too_Large_To_Paste=\u7EC4\u4EF6\u5927\u5C0F\u8D85\u51FA\u8FB9\u754C\uFF0C\u65E0\u6CD5\u7C98\u8D34\uFF01
FR-Designer_Too_Small_To_Paste=\u6B64\u5904\u65E0\u6CD5\u7C98\u8D34\uFF0C\u5C0F\u4E8E\u7EC4\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
FR-Designer_Get-CubeGetting cube=

15
designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@ -584,4 +584,17 @@ FR-Designer_Logarithmic=\u5C0D\u6578\u523B\u5EA6
FR-Designer_Chart_Log_Base=\u5E95\u6578
FR-Designer_Chart_F_Radar_Axis=\u503C\u8EF8
FR-Designer_Too_Large_To_Paste=\u7D44\u4EF6\u5927\u5C0F\u8D85\u51FA\u908A\u754C\uFF0C\u7121\u6CD5\u7C98\u8CBC\uFF01
FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
FR-Designer_Too_Small_To_Paste=\u6B64\u8655\u7121\u6CD5\u7C98\u8CBC\uFF0C\u5C0F\u65BC\u7D44\u4EF6\u6700\u5C0F\u9AD8\u5EA6\uFF01
FR-Designer_Download_Template=
FR-Designer-Selected_Widget=
FR-Designer_LocalWidget=
FR-Designer_Get-CubeGetting cube=
FR-Designer_Install_Template=
FR-Designer_Reset=
FR-Designer_SimpleCross_Report=
FR-Designer_Allow-Blank=
FR-Designer_AllCategories=
FR-Designer_SimpleDetail_Report=
FR-Designer_DoubleLayer_Report=
FR-Designer_Delete_Template=
FR-Designer_Validate=

44
designer_chart/src/com/fr/design/chart/axis/MinMaxValuePane.java

@ -42,24 +42,34 @@ public class MinMaxValuePane extends JPanel {
double p = TableLayout.PREFERRED;
double f = TableLayout.FILL;
double[] columnSize = { p, f };
double[] rowSize = { p, p, p, p};
Component[][] components = getPanelComponents();
JPanel panel = TableLayoutHelper.createTableLayoutPane(components ,rowSize,columnSize);
Component[][] components = getPanelComponents();
JPanel panel = TableLayoutHelper.createTableLayoutPane(components, getRowSize(p), columnSize);
this.setLayout(new BorderLayout());
this.add(panel,BorderLayout.CENTER);
for(int i = 0; i < components.length; i++) {
((UICheckBox)components[i][0]).addActionListener(new ActionListener() {
this.add(panel, BorderLayout.CENTER);
addComponentListener(components);
}
@Override
public void actionPerformed(ActionEvent e) {
checkBoxUse();
}
});
ChartSwingUtils.addListener((UICheckBox)components[i][0], (UITextField)components[i][1]);
}
protected double[] getRowSize(double p) {
return new double[]{p, p, p, p};
}
protected void addComponentListener(Component[][] components) {
for (int i = 0; i < components.length; i++) {
addListener((UICheckBox) components[i][0]);
ChartSwingUtils.addListener((UICheckBox) components[i][0], (UITextField) components[i][1]);
}
}
protected void addListener(UICheckBox checkBox) {
checkBox.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
checkBoxUse();
}
});
}
protected Component[][] getPanelComponents() {
return new Component[][]{
new Component[]{minCheckBox, minValueField},
@ -100,7 +110,7 @@ public class MinMaxValuePane extends JPanel {
if(axis.getMinValue() != null) {
minValueField.setText(axis.getMinValue().toString());
}
}
}
// 最大值
if (axis.isCustomMaxValue()) {
@ -108,7 +118,7 @@ public class MinMaxValuePane extends JPanel {
if(axis.getMaxValue() != null) {
maxValueField.setText(axis.getMaxValue().toString());
}
}
}
// 主次刻度单位
if (axis.isCustomMainUnit()) {
@ -116,7 +126,7 @@ public class MinMaxValuePane extends JPanel {
if(axis.getMainUnit() != null) {
mainUnitField.setText(axis.getMainUnit().toString());
}
}
}
if(axis.isCustomSecUnit()) {
isCustomSecUnitBox.setSelected(true);

19
designer_form/src/com/fr/design/designer/beans/models/SelectionModel.java

@ -142,14 +142,29 @@ public class SelectionModel {
int leftUpY = container.toData().getMargin().getTop() + 1;
//选中第一个坐标点坐在的组件
selection.setSelectedCreator((XCreator) container.getComponentAt(leftUpX, leftUpY));
pasteFromClipBoard();
Rectangle rectangle = selection.getRelativeBounds();
if (hasSelectedPasteSource()) {
selectedPaste();
} else {
FormSelectionUtils.paste2Container(designer, container, clipboard,
rectangle.x + rectangle.width / 2,
rectangle.y + DELTA_X_Y);
}
} else {
//自适应布局编辑器内部左上角第一个坐标点
int leftUpX = designer.getRootComponent().toData().getMargin().getLeft() + 1;
int leftUpY = designer.getRootComponent().toData().getMargin().getTop() + 1;
//选中第一个坐标点坐在的组件
selection.setSelectedCreator((XCreator) designer.getRootComponent().getComponentAt(leftUpX, leftUpY));
pasteFromClipBoard();
Rectangle rectangle = selection.getRelativeBounds();
if (hasSelectedPasteSource()) {
selectedPaste();
} else {
FormSelectionUtils.paste2Container(designer, designer.getRootComponent(),
clipboard,
rectangle.x + rectangle.width / 2,
rectangle.y + DELTA_X_Y);
}
}
} else {
//绝对布局

Loading…
Cancel
Save