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

designer_base/src/com/fr/design/actions/UpdateAction.java

@@ -293,13 +293,20 @@ public abstract class UpdateAction extends ShortCut implements Action {
 			button.setEnabled(this.isEnabled());
 
 			//peter:产生tooltip
-			button.setToolTipText(ActionFactory.createButtonToolTipText(this));
+			button.setToolTipText(getToolTipText());
 			object = button;
 		}
 
 		return (JComponent) object;
 	}
 
+	/**
+	 * 重写此方法，可以自定义 action 的提示文字
+	 */
+	protected String getToolTipText() {
+		return ActionFactory.createButtonToolTipText(this);
+	}
+
 	/**
 	 * Equals
 	 */

designer_form/src/com/fr/design/designer/beans/actions/FormDeleteAction.java

@@ -29,6 +29,12 @@ public class FormDeleteAction extends FormWidgetEditAction {
         this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
     }
 
+    @Override
+    protected String getToolTipText() {
+        String originText = super.getToolTipText();
+        return originText.replace(KeyEvent.getKeyText(KeyEvent.VK_BACK_SPACE), KeyEvent.getKeyText(KeyEvent.VK_DELETE));
+    }
+
     @Override
     public JComponent createToolBarComponent() {
         JComponent comp = super.createToolBarComponent();

designer_form/src/com/fr/design/designer/beans/actions/MoveToBottomAction.java

@@ -27,7 +27,13 @@ public class MoveToBottomAction extends FormWidgetEditAction {
         this.setName(Inter.getLocText("FR-Designer_Move_To_Bottom"));
         this.setMnemonic('K');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_bottom.png"));
-        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_OPEN_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK));
+    }
+
+    @Override
+    protected String getToolTipText() {
+        String originText = super.getToolTipText();
+        return originText.replace(KeyEvent.getKeyText(KeyEvent.VK_OPEN_BRACKET), "[");
     }
 
     @Override

designer_form/src/com/fr/design/designer/beans/actions/MoveToTopAction.java

@@ -27,7 +27,13 @@ public class MoveToTopAction extends FormWidgetEditAction {
         this.setName(Inter.getLocText("FR-Designer_Move_To_Top"));
         this.setMnemonic('T');
         this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/control/to_top.png"));
-        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.ALT_MASK));
+        this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_CLOSE_BRACKET, DEFAULT_MODIFIER + InputEvent.SHIFT_MASK));
+    }
+
+    @Override
+    protected String getToolTipText() {
+        String originText = super.getToolTipText();
+        return originText.replace(KeyEvent.getKeyText(KeyEvent.VK_CLOSE_BRACKET), "]");
     }
 
     @Override

designer_form/src/com/fr/design/mainframe/FormDesigner.java

@@ -349,11 +349,11 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
         }
 
         parameterArray = null;
-        refreshParameter();
+
         //parameter多的时候，不刷新会出现控件边界交叉
         refreshRoot();
-        //不知道为什么添加完参数后控件树只有一个label，这儿刷新一下控件树好了
+        // 最后刷新"添加参数面板"和控件树
-        EastRegionContainerPane.getInstance().refreshDownPane();
+        refreshParameter();
     }
 
     private void addParaPaneTooltips() {

designer_form/src/com/fr/design/mainframe/JForm.java

@@ -248,15 +248,12 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm {
 
             @Override
             public void fireCreatorModified(DesignerEvent evt) {
-                if (formDesign.getArea() == null || !formDesign.getArea().isValid()) {
-                    return;
-                }
                 if (evt.getCreatorEventID() == DesignerEvent.CREATOR_CUTED) {
                     setPropertyPaneChange(formDesign.getRootComponent());
                 } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_DELETED) {
                     // 在 delete 之前，会先 select 父组件。这里直接传入 lastAffectedCreator 就好了
                     setPropertyPaneChange(lastAffectedCreator);
-                } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED || evt.getCreatorEventID() == DesignerEvent.CREATOR_EDITED) {
+                } else if (evt.getCreatorEventID() == DesignerEvent.CREATOR_SELECTED) {
                     lastAffectedCreator = evt.getAffectedCreator();
                     setPropertyPaneChange(lastAffectedCreator);
                 }

designer_form/src/com/fr/design/parameter/ParameterPropertyPane.java

@@ -72,7 +72,7 @@ public class ParameterPropertyPane extends JPanel{
             }
         };
         JPanel scrollPaneWrapperInner = new JPanel(new BorderLayout());
-        scrollPaneWrapperInner.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, PADDING_MIDDLE, PADDING_SMALL));
+        scrollPaneWrapperInner.setBorder(BorderFactory.createEmptyBorder(PADDING_MIDDLE, PADDING_MIDDLE, PADDING_MIDDLE, PADDING_SMALL));
         scrollPaneWrapperInner.add(basicScrollPane, BorderLayout.CENTER);
         addParaPane = new JPanel(new BorderLayout());
         addParaPane.add(scrollPaneWrapperInner, BorderLayout.CENTER);
@@ -80,8 +80,8 @@ public class ParameterPropertyPane extends JPanel{
 
         initParameterListener();
         this.setLayout(new BorderLayout(0, 6));
-        this.setBorder(BorderFactory.createEmptyBorder(PADDING_MIDDLE, 0, PADDING_MIDDLE, 0));
+        this.setBorder(BorderFactory.createEmptyBorder(0, 0, PADDING_MIDDLE, 0));
-        this.add(addParaPane, BorderLayout.CENTER);
+        this.add(addParaPane, BorderLayout.NORTH);
     }
 
     // 显示或隐藏添加参数面板
@@ -106,7 +106,7 @@ public class ParameterPropertyPane extends JPanel{
     }
 
     public void setAddParaPaneVisible(boolean isVisible, JTemplate jt) {
-        if (isVisible == addParaPane.isVisible() || formHierarchyTreePaneWrapper == null) {
+        if (formHierarchyTreePaneWrapper == null) {
             return;
         }
         // 表单中，只有添加并选中参数面板时，才显示
@@ -122,15 +122,17 @@ public class ParameterPropertyPane extends JPanel{
             this.setPreferredSize(null);
         } else {
             addParaPane.setVisible(false);
+			if (formHierarchyTreePaneWrapper.getPreferredSize().height > 0) {
             	this.setPreferredSize(new Dimension(getWidth(), formHierarchyTreePaneWrapper.getPreferredSize().height + UIConstants.GAP_NORMAL));
 			}
         }
+    }
 	
 	private void setEditor(FormDesigner editor) {
 		if (formHierarchyTreePaneWrapper == null) {
 			formHierarchyTreePaneWrapper = new JPanel(new BorderLayout());
 			formHierarchyTreePaneWrapper.setBorder(BorderFactory.createEmptyBorder(0, PADDING_MIDDLE, 0, 0));
-			this.add(formHierarchyTreePaneWrapper, BorderLayout.SOUTH);
+			this.add(formHierarchyTreePaneWrapper, BorderLayout.CENTER);
 		}
 		formHierarchyTreePaneWrapper.remove(FormHierarchyTreePane.getInstance());
 		formHierarchyTreePaneWrapper.add(FormHierarchyTreePane.getInstance(editor), BorderLayout.CENTER);