From 4a2e3bd52fa6560775ea67de3c29e8f9aa2b7f71 Mon Sep 17 00:00:00 2001 From: neil Date: Wed, 15 Jun 2016 15:58:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E9=9F=A9=E6=96=87=E8=AE=BE=E8=AE=A1?= =?UTF-8?q?=E5=99=A8=E6=8C=89=E9=92=AE=E6=92=91=E5=BC=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- designer/src/com/fr/design/webattr/WebSettingPane.java | 7 ++++--- designer_base/src/com/fr/design/formula/FormulaPane.java | 1 + .../fr/design/formula/FormulaPaneWhenReserveFormula.java | 4 ++-- .../com/fr/design/gui/icontainer/UIResizableContainer.java | 4 ++++ 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/designer/src/com/fr/design/webattr/WebSettingPane.java b/designer/src/com/fr/design/webattr/WebSettingPane.java index 24d991407..d4bb3485c 100644 --- a/designer/src/com/fr/design/webattr/WebSettingPane.java +++ b/designer/src/com/fr/design/webattr/WebSettingPane.java @@ -4,6 +4,7 @@ import com.fr.base.ConfigManager; import com.fr.design.beans.BasicBeanPane; import com.fr.design.gui.core.WidgetOption; import com.fr.design.gui.icombobox.UIComboBox; +import com.fr.design.gui.icontainer.UIScrollPane; import com.fr.design.gui.ilable.UILabel; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.layout.TableLayout; @@ -81,9 +82,9 @@ public abstract class WebSettingPane extends BasicBeanPane } this.setLayout(new BorderLayout()); - JPanel allPanel = FRGUIPaneFactory.createBorderLayout_L_Pane(); - allPanel.add(panel,BorderLayout.CENTER); - this.add(allPanel,BorderLayout.CENTER); + + UIScrollPane scrollPane = new UIScrollPane(panel); + this.add(scrollPane, BorderLayout.CENTER); } ItemListener itemListener = new ItemListener() { diff --git a/designer_base/src/com/fr/design/formula/FormulaPane.java b/designer_base/src/com/fr/design/formula/FormulaPane.java index 34a523697..d7e3f21be 100644 --- a/designer_base/src/com/fr/design/formula/FormulaPane.java +++ b/designer_base/src/com/fr/design/formula/FormulaPane.java @@ -166,6 +166,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula{ checkValidButton.addActionListener(checkValidActionListener); JPanel checkBoxPane = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane(); + checkBoxPane.setPreferredSize(new Dimension(450, 30)); checkBoxandbuttonPane.add(checkBoxPane, BorderLayout.WEST); checkBoxandbuttonPane.add(checkValidButton, BorderLayout.EAST); diff --git a/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java b/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java index cd55c06bd..05530d630 100644 --- a/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java +++ b/designer_base/src/com/fr/design/formula/FormulaPaneWhenReserveFormula.java @@ -25,7 +25,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { @Override protected void extendCheckBoxPane(JPanel checkBoxPane) { // peter:添加公式是否兼容Excel的属性 - reserveCheckBox4Result = new UICheckBox(Inter.getLocText("FormulaD-Reserve_when_export-edit_result")); + reserveCheckBox4Result = new UICheckBox(Inter.getLocText("FR-Designer_Export-Save-Formula")); reserveCheckBox4Result.setSelected(false); reserveCheckBox4Result.addChangeListener(new ChangeListener() { @@ -38,7 +38,7 @@ public class FormulaPaneWhenReserveFormula extends FormulaPane { } } }); - reserveCheckBox4Write = new UICheckBox(Inter.getLocText("FormulaD-Reserve_when_bs-write_or_analy")); + reserveCheckBox4Write = new UICheckBox(Inter.getLocText("FR-Designer_Write-Save-Formula")); reserveCheckBox4Write.setSelected(false); checkBoxPane.add(reserveCheckBox4Result, BorderLayout.CENTER); diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java index b436c4de5..22d1bb521 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java +++ b/designer_base/src/com/fr/design/gui/icontainer/UIResizableContainer.java @@ -175,6 +175,10 @@ public class UIResizableContainer extends JPanel { @Override public void layoutContainer(Container parent) { + if (verticalToolPane == null || downPane == null) { + return; + } + if (direction == Constants.RIGHT) { if(isDownPaneVisible){ upPane.setBounds(0, 0, containerWidth - toolPaneHeight, toolPaneY); From ef253ee9fb2ab496480845d0b8992b26ae725d24 Mon Sep 17 00:00:00 2001 From: neil Date: Wed, 15 Jun 2016 16:05:44 +0800 Subject: [PATCH 2/3] 1 --- designer_base/src/com/fr/design/formula/FormulaPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/formula/FormulaPane.java b/designer_base/src/com/fr/design/formula/FormulaPane.java index d7e3f21be..339019135 100644 --- a/designer_base/src/com/fr/design/formula/FormulaPane.java +++ b/designer_base/src/com/fr/design/formula/FormulaPane.java @@ -37,7 +37,7 @@ import java.awt.event.*; import java.io.*; import java.util.Locale; /** - * 公式编辑面板 + * 公式编辑面板 * @editor zhou * @since 2012-3-29下午1:50:53 */ From a1ed78437965dce1e79454103cbd5c5b4f04a926 Mon Sep 17 00:00:00 2001 From: neil Date: Wed, 15 Jun 2016 16:05:54 +0800 Subject: [PATCH 3/3] 1 --- designer_base/src/com/fr/design/formula/FormulaPane.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer_base/src/com/fr/design/formula/FormulaPane.java b/designer_base/src/com/fr/design/formula/FormulaPane.java index 339019135..d7e3f21be 100644 --- a/designer_base/src/com/fr/design/formula/FormulaPane.java +++ b/designer_base/src/com/fr/design/formula/FormulaPane.java @@ -37,7 +37,7 @@ import java.awt.event.*; import java.io.*; import java.util.Locale; /** - * 公式编辑面板 + * 公式编辑面板 * @editor zhou * @since 2012-3-29下午1:50:53 */