Browse Source

Merge remote-tracking branch 'origin/9.0' into 9.0

master
MoMeak 7 years ago
parent
commit
afb94a8468
  1. 2
      designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java
  2. 6
      designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java
  3. 2
      designer/src/com/fr/design/widget/ui/WaterMarkDictPane.java
  4. 2
      designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java
  5. 1
      designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java
  6. 42
      designer_base/src/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java
  7. 78
      designer_base/src/com/fr/design/layout/FRGUIPaneFactory.java

2
designer/src/com/fr/design/widget/ui/DirectWriteEditorDefinePane.java

@ -22,7 +22,7 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
@Override @Override
protected JPanel setFirstContentPane() { protected JPanel setFirstContentPane() {
JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane(); JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
contentPane.setBorder(BorderFactory.createEmptyBorder(0, 2, 0, 0)); contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false); directWriteCheckBox = new UICheckBox(Inter.getLocText("Form-Allow_Edit"), false);
directWriteCheckBox.setPreferredSize(new Dimension(100, 30)); directWriteCheckBox.setPreferredSize(new Dimension(100, 30));

6
designer/src/com/fr/design/widget/ui/TreeEditorDefinePane.java

@ -5,6 +5,9 @@ import com.fr.design.gui.frpane.TreeSettingPane;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.itree.refreshabletree.TreeRootPane; import com.fr.design.gui.itree.refreshabletree.TreeRootPane;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.layout.FRLeftFlowLayout;
import com.fr.design.layout.TableLayout;
import com.fr.design.layout.TableLayoutHelper;
import com.fr.form.ui.TreeEditor; import com.fr.form.ui.TreeEditor;
import com.fr.general.Inter; import com.fr.general.Inter;
@ -52,7 +55,8 @@ public class TreeEditorDefinePane extends FieldEditorDefinePane<TreeEditor> {
protected JPanel setSecondContentPane() { protected JPanel setSecondContentPane() {
JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); JPanel contenter = FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane_First0();
contentPane.add(contenter,BorderLayout.NORTH); contentPane.add(contenter,BorderLayout.NORTH);
removeRepeatCheckBox = new UICheckBox(Inter.getLocText("Form-Remove_Repeat_Data"), false); removeRepeatCheckBox = new UICheckBox(Inter.getLocText("Form-Remove_Repeat_Data"), false);
contenter.add(removeRepeatCheckBox); contenter.add(removeRepeatCheckBox);

2
designer/src/com/fr/design/widget/ui/WaterMarkDictPane.java

@ -39,7 +39,7 @@ public class WaterMarkDictPane extends JPanel {
int[][] rowCount = {{1, 1}}; int[][] rowCount = {{1, 1}};
JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize); JPanel panel = TableLayoutHelper.createTableLayoutPane(components, rowSize, columnSize);
// JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM); // JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, LayoutConstants.VGAP_LARGE, LayoutConstants.VGAP_MEDIUM);
panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0)); panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
this.add(panel, BorderLayout.CENTER); this.add(panel, BorderLayout.CENTER);
} }

2
designer/src/com/fr/design/widget/ui/WritableRepeatEditorPane.java

@ -15,7 +15,7 @@ public abstract class WritableRepeatEditorPane<E extends WriteAbleRepeatEditor>
@Override @Override
protected JPanel setSecondContentPane() { protected JPanel setSecondContentPane() {
JPanel contentPane = FRGUIPaneFactory.createBorderLayout_L_Pane(); JPanel contentPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0)); contentPane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
JPanel otherContentPane = this.setThirdContentPane(); JPanel otherContentPane = this.setThirdContentPane();
if (otherContentPane != null) { if (otherContentPane != null) {

1
designer_base/src/com/fr/design/gui/frpane/TreeSettingPane.java

@ -52,6 +52,7 @@ public class TreeSettingPane extends BasicPane implements DataCreatorUI {
private void initComponents(boolean isEditor) { private void initComponents(boolean isEditor) {
this.setLayout(FRGUIPaneFactory.createBorderLayout()); this.setLayout(FRGUIPaneFactory.createBorderLayout());
JPanel buildWayPanel= FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane(); JPanel buildWayPanel= FRGUIPaneFactory.createMediumHGapFlowInnerContainer_M_Pane();
buildWayPanel.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
UILabel buildWayLabel = new UILabel(Inter.getLocText("FR-Designer_Build-Way") + " :"); UILabel buildWayLabel = new UILabel(Inter.getLocText("FR-Designer_Build-Way") + " :");
buildWayPanel.add(buildWayLabel); buildWayPanel.add(buildWayLabel);
buildBox = new UIComboBox(buildWay); buildBox = new UIComboBox(buildWay);

42
designer_base/src/com/fr/design/gui/itree/refreshabletree/TreeRootPane.java

@ -9,7 +9,6 @@ import javax.swing.JPanel;
import com.fr.data.impl.TreeAttr; import com.fr.data.impl.TreeAttr;
import com.fr.design.gui.icheckbox.UICheckBox; import com.fr.design.gui.icheckbox.UICheckBox;
import com.fr.design.gui.icombobox.UIComboBox;
import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.FRGUIPaneFactory;
import com.fr.design.dialog.BasicPane; import com.fr.design.dialog.BasicPane;
import com.fr.general.Inter; import com.fr.general.Inter;
@ -18,10 +17,10 @@ public class TreeRootPane extends BasicPane {
// 是否支持多选(checkBoxTree) // 是否支持多选(checkBoxTree)
//private JCheckBox multipleSelection; //private JCheckBox multipleSelection;
private UIComboBox checkTypeComboBox; private UICheckBox checkTypeCheckBox;
// richer:加载的方式,支持异步加载和完全加载 // richer:加载的方式,支持异步加载和完全加载
private UIComboBox loadTypeComboBox; private UICheckBox loadTypeCheckBox;
private UICheckBox layerTypeCheckBox; private UICheckBox layerTypeCheckBox;
@ -30,30 +29,25 @@ public class TreeRootPane extends BasicPane {
public TreeRootPane() { public TreeRootPane() {
this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS)); this.setLayout(new BoxLayout(this, BoxLayout.Y_AXIS));
JPanel checkTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel checkTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
checkTypePane.add(new UILabel(Inter.getLocText("Tree-Mutiple_Selection_Or_Not") + ":")); checkTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Mutiple_Selection_Or_Not"));
checkTypeComboBox = new UIComboBox(new String[] {Inter.getLocText("Yes"), Inter.getLocText("No")}); checkTypePane.add(checkTypeCheckBox);
checkTypePane.add(checkTypeComboBox);
this.add(checkTypePane); this.add(checkTypePane);
JPanel loadTypePane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel loadTypePane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
loadTypePane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
loadTypePane.add(new UILabel(Inter.getLocText("Widget-Load_Type") + ":")); loadTypeCheckBox = new UICheckBox(Inter.getLocText("Widget-Load_By_Async"));
loadTypeComboBox = new UIComboBox(new String[]{Inter.getLocText("Widget-Load_By_Async"), Inter.getLocText("Widget-Load_By_Complete")}); loadTypePane.add(loadTypeCheckBox);
loadTypePane.add(loadTypeComboBox);
this.add(loadTypePane); this.add(loadTypePane);
JPanel leafSelectPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel leafSelectPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
leafSelectPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
leafSelectPane.add(layerTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Select_Leaf_Only"))); leafSelectPane.add(layerTypeCheckBox = new UICheckBox(Inter.getLocText("Tree-Select_Leaf_Only")));
UILabel tips = new UILabel(Inter.getLocText("Tree-Select_Leaf_Only_Tips"));
tips.setForeground(new Color(147, 178, 233));
leafSelectPane.add(tips);
this.add(leafSelectPane); this.add(leafSelectPane);
JPanel returnFullPathPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); JPanel returnFullPathPane = FRGUIPaneFactory.createBoxFlowInnerContainer_S_Pane_First0();
returnFullPathPane.setBorder(BorderFactory.createEmptyBorder(0, 5, 0, 0)); checkTypePane.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(Inter.getLocText("Tree-Return_Full_Path"))); returnFullPathPane.add(returnFullPathCheckBox = new UICheckBox(Inter.getLocText("Tree-Return_Full_Path")));
this.add(returnFullPathPane); this.add(returnFullPathPane);
@ -65,16 +59,16 @@ public class TreeRootPane extends BasicPane {
} }
public void populate(TreeAttr treeAttr) { public void populate(TreeAttr treeAttr) {
checkTypeComboBox.setSelectedIndex(treeAttr.isMultipleSelection() ? 0 : 1); checkTypeCheckBox.setSelected(treeAttr.isMultipleSelection());
loadTypeComboBox.setSelectedIndex(treeAttr.isAjax() ? 0 : 1); loadTypeCheckBox.setSelected(treeAttr.isAjax());
layerTypeCheckBox.setSelected(treeAttr.isSelectLeafOnly()); layerTypeCheckBox.setSelected(treeAttr.isSelectLeafOnly());
returnFullPathCheckBox.setSelected(treeAttr.isReturnFullPath()); returnFullPathCheckBox.setSelected(treeAttr.isReturnFullPath());
} }
public TreeAttr update() { public TreeAttr update() {
TreeAttr treeAttr = new TreeAttr(); TreeAttr treeAttr = new TreeAttr();
treeAttr.setMultipleSelection(checkTypeComboBox.getSelectedIndex() == 0); treeAttr.setMultipleSelection(checkTypeCheckBox.isSelected());
treeAttr.setAjax(loadTypeComboBox.getSelectedIndex() == 0); treeAttr.setAjax(loadTypeCheckBox.isSelected());
treeAttr.setSelectLeafOnly(layerTypeCheckBox.isSelected()); treeAttr.setSelectLeafOnly(layerTypeCheckBox.isSelected());
treeAttr.setReturnFullPath(returnFullPathCheckBox.isSelected()); treeAttr.setReturnFullPath(returnFullPathCheckBox.isSelected());

78
designer_base/src/com/fr/design/layout/FRGUIPaneFactory.java

@ -1,19 +1,10 @@
package com.fr.design.layout; package com.fr.design.layout;
import java.awt.BorderLayout; import com.fr.design.border.UITitledBorder;
import java.awt.CardLayout;
import java.awt.Color;
import java.awt.FlowLayout;
import java.awt.LayoutManager;
import javax.swing.BorderFactory;
import javax.swing.BoxLayout;
import javax.swing.Icon;
import com.fr.design.gui.ilable.UILabel; import com.fr.design.gui.ilable.UILabel;
import javax.swing.JPanel;
import javax.swing.JRadioButton;
import com.fr.design.border.UITitledBorder; import javax.swing.*;
import java.awt.*;
public class FRGUIPaneFactory { public class FRGUIPaneFactory {
private FRGUIPaneFactory() { private FRGUIPaneFactory() {
@ -29,6 +20,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠右靠左的水平间隙为2的流式布局 * 创建一个靠右靠左的水平间隙为2的流式布局
*
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多 public static LayoutManager createBoxFlowLayout() { // createBoxFlowLayout 图表用到的比较多
@ -37,6 +29,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左的布局 * 创建一个靠左的布局
*
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createLeftZeroLayout() { public static LayoutManager createLeftZeroLayout() {
@ -45,6 +38,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左的水平和垂直间隙均为5的流式布局 * 创建一个靠左的水平和垂直间隙均为5的流式布局
*
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createLabelFlowLayout() { // createLabelFlowLayout public static LayoutManager createLabelFlowLayout() { // createLabelFlowLayout
@ -53,6 +47,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左流式布局间距10,10 * 创建一个靠左流式布局间距10,10
*
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createL_FlowLayout() { public static LayoutManager createL_FlowLayout() {
@ -61,6 +56,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个居中流式布局 * 创建一个居中流式布局
*
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createCenterFlowLayout() { public static LayoutManager createCenterFlowLayout() {
@ -69,6 +65,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠右流式布局 * 创建一个靠右流式布局
*
* @return FlowLayout对象 * @return FlowLayout对象
*/ */
public static LayoutManager createRightFlowLayout() { public static LayoutManager createRightFlowLayout() {
@ -77,6 +74,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个边框布局 * 创建一个边框布局
*
* @return BorderLayout对象 * @return BorderLayout对象
*/ */
public static LayoutManager createBorderLayout() { public static LayoutManager createBorderLayout() {
@ -85,6 +83,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个边框布局间距4,4 * 创建一个边框布局间距4,4
*
* @return BorderLayout对象 * @return BorderLayout对象
*/ */
public static LayoutManager createM_BorderLayout() { public static LayoutManager createM_BorderLayout() {
@ -95,6 +94,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个1列的网格布局 * 创建一个1列的网格布局
*
* @return FRGridLayout对象 * @return FRGridLayout对象
*/ */
public static LayoutManager create1ColumnGridLayout() { public static LayoutManager create1ColumnGridLayout() {
@ -103,6 +103,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个2列的网格布局 * 创建一个2列的网格布局
*
* @return FRGridLayout对象 * @return FRGridLayout对象
*/ */
public static LayoutManager create2ColumnGridLayout() { public static LayoutManager create2ColumnGridLayout() {
@ -111,6 +112,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个n列的网格布局 * 创建一个n列的网格布局
*
* @param nColumn 列数 * @param nColumn 列数
* @return FRGridLayout对象 * @return FRGridLayout对象
*/ */
@ -120,6 +122,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个带标题边框面板 * 创建一个带标题边框面板
*
* @param string 边框标题 * @param string 边框标题
* @return JPanel对象 * @return JPanel对象
*/ */
@ -133,6 +136,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个带标题边框面板并且居中显示 * 创建一个带标题边框面板并且居中显示
*
* @param borderTitle 边框标题 * @param borderTitle 边框标题
* @return JPanel对象 * @return JPanel对象
*/ */
@ -146,6 +150,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左空边框布局间隔大 * 创建一个靠左空边框布局间隔大
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createBigHGapFlowInnerContainer_M_Pane() { public static JPanel createBigHGapFlowInnerContainer_M_Pane() {
@ -157,6 +162,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左空边框面板间隔中等 * 创建一个靠左空边框面板间隔中等
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createMediumHGapFlowInnerContainer_M_Pane() { public static JPanel createMediumHGapFlowInnerContainer_M_Pane() {
@ -166,8 +172,21 @@ public class FRGUIPaneFactory {
return jp; return jp;
} }
/**
* 创建一个靠左空边框面板间隔中等firsthgap 为0
*
* @return JPanel对象
*/
public static JPanel createMediumHGapFlowInnerContainer_M_Pane_First0() {
JPanel jp = new JPanel();
jp.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
jp.setLayout(new FRLeftFlowLayout(0, 20, 5));
return jp;
}
/** /**
* 创建一个靠左空边框面板间隔中等 * 创建一个靠左空边框面板间隔中等
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createMediumHGapHighTopFlowInnerContainer_M_Pane() { public static JPanel createMediumHGapHighTopFlowInnerContainer_M_Pane() {
@ -179,6 +198,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个正常靠左空边框面板 * 创建一个正常靠左空边框面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createNormalFlowInnerContainer_M_Pane() { public static JPanel createNormalFlowInnerContainer_M_Pane() {
@ -190,6 +210,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左0间距边框面板 * 创建一个靠左0间距边框面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createLeftFlowZeroGapBorderPane() { public static JPanel createLeftFlowZeroGapBorderPane() {
@ -201,6 +222,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左流式布局正常流式内嵌 * 创建一个靠左流式布局正常流式内嵌
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createNormalFlowInnerContainer_S_Pane() { public static JPanel createNormalFlowInnerContainer_S_Pane() {
@ -211,6 +233,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个靠左流式布局流式内嵌 * 创建一个靠左流式布局流式内嵌
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createBoxFlowInnerContainer_S_Pane() { public static JPanel createBoxFlowInnerContainer_S_Pane() {
@ -219,8 +242,20 @@ public class FRGUIPaneFactory {
return jp; return jp;
} }
/**
* 创建一个靠左流式布局流式内嵌首元素距离左边0
*
* @return JPanel对象
*/
public static JPanel createBoxFlowInnerContainer_S_Pane_First0() {
JPanel jp = new JPanel();
jp.setLayout(new FRLeftFlowLayout(0, 0, 5));
return jp;
}
/** /**
* 创建一个靠右面板 * 创建一个靠右面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createRightFlowInnerContainer_S_Pane() { public static JPanel createRightFlowInnerContainer_S_Pane() {
@ -231,6 +266,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个居中面板 * 创建一个居中面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createCenterFlowInnerContainer_S_Pane() { public static JPanel createCenterFlowInnerContainer_S_Pane() {
@ -241,6 +277,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建一个居中0间距面板 * 创建一个居中0间距面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createCenterFlowZeroGapBorderPane() { public static JPanel createCenterFlowZeroGapBorderPane() {
@ -252,6 +289,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建纵向排列面板 * 创建纵向排列面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createY_AXISBoxInnerContainer_L_Pane() { public static JPanel createY_AXISBoxInnerContainer_L_Pane() {
@ -263,6 +301,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建纵向边框面板 * 创建纵向边框面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createYBoxEmptyBorderPane() { public static JPanel createYBoxEmptyBorderPane() {
@ -274,6 +313,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建横向面板 * 创建横向面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createX_AXISBoxInnerContainer_L_Pane() { public static JPanel createX_AXISBoxInnerContainer_L_Pane() {
@ -285,6 +325,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建纵向面板M * 创建纵向面板M
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createY_AXISBoxInnerContainer_M_Pane() { public static JPanel createY_AXISBoxInnerContainer_M_Pane() {
@ -296,6 +337,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建横向内置boxlayout的面板 * 创建横向内置boxlayout的面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createX_AXISBoxInnerContainer_M_Pane() { public static JPanel createX_AXISBoxInnerContainer_M_Pane() {
@ -307,6 +349,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建纵向内置boxlayout的面板 * 创建纵向内置boxlayout的面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createY_AXISBoxInnerContainer_S_Pane() { public static JPanel createY_AXISBoxInnerContainer_S_Pane() {
@ -317,6 +360,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建横向内置boxlayout的面板 * 创建横向内置boxlayout的面板
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createX_AXISBoxInnerContainer_S_Pane() { public static JPanel createX_AXISBoxInnerContainer_S_Pane() {
@ -327,6 +371,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建n列网格面板 * 创建n列网格面板
*
* @param nColumn 列数 * @param nColumn 列数
* @return JPanel对象 * @return JPanel对象
*/ */
@ -338,6 +383,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建n列网格面板 * 创建n列网格面板
*
* @param nColumn 列数 * @param nColumn 列数
* @param h 水平间距 * @param h 水平间距
* @param v 垂直间距 * @param v 垂直间距
@ -351,6 +397,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建顶格n列网格面板 * 创建顶格n列网格面板
*
* @param nColumn 列数 * @param nColumn 列数
* @return JPanel对象 * @return JPanel对象
*/ */
@ -362,6 +409,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建边框面板L * 创建边框面板L
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createBorderLayout_L_Pane() { public static JPanel createBorderLayout_L_Pane() {
@ -373,6 +421,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建边框面板M * 创建边框面板M
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createBorderLayout_M_Pane() { public static JPanel createBorderLayout_M_Pane() {
@ -384,6 +433,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建边框面板S * 创建边框面板S
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createBorderLayout_S_Pane() { public static JPanel createBorderLayout_S_Pane() {
@ -394,6 +444,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建卡片式布局 * 创建卡片式布局
*
* @return JPanel对象 * @return JPanel对象
*/ */
public static JPanel createCardLayout_S_Pane() { public static JPanel createCardLayout_S_Pane() {
@ -404,6 +455,7 @@ public class FRGUIPaneFactory {
/** /**
* 创建图标IconRadio面板 * 创建图标IconRadio面板
*
* @param icon 图标 * @param icon 图标
* @param jradiobtn 按钮 * @param jradiobtn 按钮
* @return JPanel对象 * @return JPanel对象
@ -423,6 +475,7 @@ public class FRGUIPaneFactory {
/** /**
* 计算宽度 * 计算宽度
*
* @param width 宽度输入值 * @param width 宽度输入值
* @return w 宽度输出值 * @return w 宽度输出值
*/ */
@ -443,6 +496,7 @@ public class FRGUIPaneFactory {
/** /**
* 计算高度 * 计算高度
*
* @param height 高度输入值 * @param height 高度输入值
* @return 高度输出值 * @return 高度输出值
*/ */

Loading…
Cancel
Save