Merge pull request #149 in BA/design from ~NEIL/design:master to master

* commit 'a1ed78437965dce1e79454103cbd5c5b4f04a926':
  1
  1
  韩文设计器按钮撑开.

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<T extends WebContent> 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() {

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);
 

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);

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);