Browse Source

Merge pull request #1436 in BA/design from ~KERRY/design:release/9.0 to release/9.0

* commit '4283bf17cb0c4db19558fac4cc910dd10cca72c1':
  REPORT-5491 9.0设计器交互验收
master
superman 7 years ago
parent
commit
0d36c6b358
  1. 9
      designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java
  2. 5
      designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java
  3. 1
      designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java
  4. 8
      designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

9
designer/src/com/fr/design/widget/ui/DateEditorDefinePane.java

@ -2,6 +2,8 @@ package com.fr.design.widget.ui;
import com.fr.base.FRContext;
import com.fr.data.core.FormatField;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.gui.ibutton.UIButtonGroup;
import com.fr.design.gui.icombobox.UIComboBox;
@ -16,6 +18,7 @@ import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;
import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
@ -78,8 +81,10 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
}
private JPanel createFormatPane(UIComboBox formatComboBox, UILabel sampleLabel){
JPanel previewPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Base_StyleFormat_Sample"));
previewPane.setLayout(new BorderLayout());
JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), Inter.getLocText("FR-Base_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR);
previewPane.setBorder(titledBorder);
JPanel sampleLabelWrapper = new JPanel(new BorderLayout());
sampleLabelWrapper.setBorder(BorderFactory.createEmptyBorder(0, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING));

5
designer/src/com/fr/design/widget/ui/btn/DefineAppendColumnRowPane.java

@ -1,5 +1,6 @@
package com.fr.design.widget.ui.btn;
import java.awt.Color;
import java.awt.Component;
import javax.swing.BorderFactory;
@ -43,7 +44,9 @@ public class DefineAppendColumnRowPane extends BasicPane {
rowCountLable = new UILabel(Inter.getLocText("Edit-Row_Count"));
JPanel lpane = FRGUIPaneFactory.createBorderLayout_S_Pane();
lpane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
lpane.add(new UILabel(Inter.getLocText("Append_Delete_Row_Message")));
UILabel label = new UILabel(Inter.getLocText("Append_Delete_Row_Message"));
label.setForeground(new Color(0x8F8F92));
lpane.add(label);
Component[][] components = { { new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor }, { rowCountLable, jNumberEditor } ,{lpane,null}};
JPanel contentPane = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));

1
designer/src/com/fr/design/widget/ui/btn/DefineDeleteColumnRowPane.java

@ -36,6 +36,7 @@ public class DefineDeleteColumnRowPane extends BasicPane {
double columnSize[] = { p, f};
crEditor = new ColumnRowEditor();
UILabel messageLabel = new UILabel(Inter.getLocText("Append_Delete_Row_Message"));
messageLabel.setForeground(new Color(0x8F8F92));
Component[][] components = {
{ new UILabel(Inter.getLocText(new String[]{"Specify", "Cell"})), crEditor },
{ messageLabel, null}};

8
designer_form/src/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@ -2,6 +2,8 @@ package com.fr.design.widget.ui.designer;
import com.fr.base.FRContext;
import com.fr.data.core.FormatField;
import com.fr.design.border.UIRoundedBorder;
import com.fr.design.constants.UIConstants;
import com.fr.design.designer.IntervalConstants;
import com.fr.design.designer.creator.XCreator;
import com.fr.design.gui.ibutton.UIButtonGroup;
@ -18,6 +20,7 @@ import com.fr.general.Inter;
import com.fr.stable.ArrayUtils;
import javax.swing.*;
import javax.swing.border.TitledBorder;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import java.awt.*;
@ -87,8 +90,9 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
private JPanel createFormatPane(UIComboBox formatComboBox, UILabel sampleLabel){
JPanel previewPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Base_StyleFormat_Sample"));
previewPane.setLayout(new BorderLayout());
JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
TitledBorder titledBorder = new TitledBorder(new UIRoundedBorder(UIConstants.LINE_COLOR, 1, 5), Inter.getLocText("FR-Base_StyleFormat_Sample"), 4, 2, this.getFont(), UIConstants.LINE_COLOR);
previewPane.setBorder(titledBorder);
JPanel sampleLabelWrapper = new JPanel(new BorderLayout());
sampleLabelWrapper.setBorder(BorderFactory.createEmptyBorder(0, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING, SAMPLE_LABEL_PADDING));

Loading…
Cancel
Save