Merge branch 'dev' of http://www.finedevelop.com:2015/scm/BA/design into dev

# Conflicts:
#	designer_base/src/com/fr/design/locale/designer_en_US.properties
#	designer_base/src/com/fr/design/locale/designer_zh_CN.properties
#	designer_base/src/com/fr/design/locale/designer_zh_TW.properties

designer_base/src/com/fr/design/locale/designer_en_US.properties

@@ -490,3 +490,4 @@ FR-Designer_Export_failed=Export failed
 FR-Designer_Exported_successfully=Exported successfully
 FR-Designer_Exporting=Exporting
 FR-Designer_Export-PDF=PDF
+FR-Designer_Properties_Mobile=MobileProperties

designer_base/src/com/fr/design/locale/designer_zh_CN.properties

@@ -422,7 +422,7 @@ FR-Designer-Website_Url=http\://www.finereport.com/
 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u5F55\u540E\u624D\u80FD\u4E0B\u8F7D
 FR-Designer-App_ReLayout=\u624B\u673A\u91CD\u5E03\u5C40
 FR-Designer_Mobile-Attr=\u79FB\u52A8\u7AEF\u5C5E\u6027
-FR-Designer_Mobile-Vertical=\u7AD6\u5C4F
+FR-Designer_Mobile-Vertical=\u7AD6\u5C4FF
 FR-Designer_Mobile-Horizontal=\u6A2A\u5C4F
 FR-Designer_COMMUNITY=\u793E\u533A
 FR-Designer_COMMUNITY_BBS=\u5E06\u8F6F\u8BBA\u575B
@@ -494,3 +494,4 @@ FR-Designer_Export_failed=\u5BFC\u51FA\u5931\u8D25
 FR-Designer_Exported_successfully=\u5BFC\u51FA\u6210\u529F
 FR-Designer_Exporting=\u6B63\u5728\u5BFC\u51FA
 FR-Designer_Export-PDF=PDF\u683C\u5F0F
+FR-Designer_Properties_Mobile=\u624B\u673A\u5C5E\u6027

designer_base/src/com/fr/design/locale/designer_zh_TW.properties

@@ -482,3 +482,4 @@ FR-Designer_Export_failed=\u532F\u51FA\u5931\u6557
 FR-Designer_Exported_successfully=\u532F\u51FA\u6210\u529F
 FR-Designer_Exporting=\u6B63\u5728\u532F\u51FA...
 FR-Designer_Export-PDF=PDF\u683C\u5F0F
+FR-Designer_Properties_Mobile=\u624B\u6A5F\u5C6C\u6027

designer_form/src/com/fr/design/designer/creator/XCreator.java

@@ -617,4 +617,5 @@ public abstract class XCreator extends JPanel implements XComponent, XCreatorToo
 	public void adjustCompHeight(double percent) {
 		return;
 	}
+
 }

designer_form/src/com/fr/design/designer/creator/XWAbsoluteBodyLayout.java

@@ -2,7 +2,9 @@ package com.fr.design.designer.creator;
 
 import com.fr.design.designer.beans.LayoutAdapter;
 import com.fr.design.designer.beans.adapters.layout.FRAbsoluteBodyLayoutAdapter;
+import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
 import com.fr.design.mainframe.widget.editors.WLayoutBorderStyleEditor;
 import com.fr.design.mainframe.widget.renderer.LayoutBorderStyleRenderer;
@@ -87,8 +89,14 @@ public class XWAbsoluteBodyLayout extends XWAbsoluteLayout {
         };
     }
 
+    @Override
+    public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+        return new WidgetPropertyUIProvider[]{ new BodyMobilePropertyUI(this)};
+    }
+
     @Override
     protected void initStyle() {
         initBorderStyle();
     }
+
 }

designer_form/src/com/fr/design/designer/creator/XWFitLayout.java

@@ -25,6 +25,7 @@ import com.fr.form.ui.container.WBodyLayoutType;
 import com.fr.form.ui.container.WFitLayout;
 import com.fr.form.ui.container.WLayout;
 import com.fr.general.FRScreen;
+import com.fr.general.Inter;
 import com.fr.stable.ArrayUtils;
 
 /**

designer_form/src/com/fr/design/designer/creator/cardlayout/XWTabFitLayout.java

@@ -14,7 +14,9 @@ import com.fr.design.designer.creator.CRPropertyDescriptor;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.properties.mobile.BodyMobilePropertyUI;
 import com.fr.design.form.util.XCreatorConstants;
+import com.fr.design.fun.WidgetPropertyUIProvider;
 import com.fr.design.mainframe.FormDesigner;
 import com.fr.design.mainframe.FormHierarchyTreePane;
 import com.fr.design.mainframe.widget.editors.PaddingMarginEditor;
@@ -367,4 +369,13 @@ public class XWTabFitLayout extends XWFitLayout {
 	public XLayoutContainer getTopLayout() {
 		return this.getBackupParent().getTopLayout();
 	}
+
+	/**
+	 * 重写这个方法，解决tab块底下仍然显示手机重布局的bug
+	 * @return
+	 */
+	@Override
+	public WidgetPropertyUIProvider[] getWidgetPropertyUIProviders() {
+		return new WidgetPropertyUIProvider[0];
+	}
 }

designer_form/src/com/fr/design/designer/properties/BodyAppRelayoutTable.java

@@ -53,7 +53,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
 			FRContext.getLogger().error(e.getMessage());
 		}
 
-		groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer-Layout_Adaptive_Layout"), xCreator, propertyTableEditor, designer)));
+		groups.add(new PropertyGroup(new ReportAppPropertyGroupModel(Inter.getLocText("FR-Designer_Properties_Mobile"), xCreator, propertyTableEditor, designer)));
 
 		TableModel model = new BeanTableModel();
 		setModel(model);
@@ -65,7 +65,7 @@ public class BodyAppRelayoutTable extends AbstractPropertyTable {
 	 * 单元格tooltip
 	 * 属性名悬浮提示 
 	 * 
-	 * @param 鼠标点击事件
+	 * @param event 鼠标点击事件
 	 * @return 单元格tooltip
 	 */
 	public String getToolTipText(MouseEvent event) {

designer_form/src/com/fr/design/designer/properties/mobile/BodyMobilePropertyUI.java

@@ -1,6 +1,7 @@
 package com.fr.design.designer.properties.mobile;
 
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XWAbsoluteBodyLayout;
 import com.fr.design.designer.creator.XWFitLayout;
 import com.fr.design.designer.properties.BodyAppRelayoutTable;
 import com.fr.design.fun.impl.AbstractWidgetPropertyUIProvider;
@@ -18,6 +19,10 @@ public class BodyMobilePropertyUI extends AbstractWidgetPropertyUIProvider {
         this.xCreator = xwFitLayout;
     }
 
+    public BodyMobilePropertyUI(XWAbsoluteBodyLayout xwAbsoluteBodyLayout) {
+        this.xCreator = xwAbsoluteBodyLayout;
+    }
+
     @Override
     public AbstractPropertyTable createWidgetAttrTable() {
         return new BodyAppRelayoutTable(xCreator);