Merge branch 'release/10.0' of ssh://cloud.finedevelop.com:7999/~joe.jiang/design into release/10.0

designer-base/src/main/java/com/fr/design/update/push/DesignerPushUpdateManager.java

@@ -7,16 +7,11 @@ import com.fr.design.mainframe.DesignerFrame;
 import com.fr.design.os.impl.SupportOSImpl;
 import com.fr.design.update.ui.dialog.UpdateMainDialog;
 import com.fr.general.CloudCenter;
-import com.fr.general.GeneralContext;
 import com.fr.general.GeneralUtils;
 import com.fr.general.http.HttpToolbox;
 import com.fr.json.JSONObject;
 import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
-import com.fr.stable.os.OperatingSystem;
-import com.fr.stable.os.support.OSBasedAction;
-import com.fr.stable.os.support.OSSupportCenter;
-import com.fr.workspace.WorkContext;
 
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -88,9 +88,9 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         unavailableTipLabel.setForeground(Color.gray);
         panel.add(unavailableTipLabel, BorderLayout.NORTH);
         allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
-        panel.add(allowFullCheckBox);
+        panel.add(allowFullCheckBox,BorderLayout.CENTER);
         functionalWhenUnactivatedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Functional_When_Unactivated"));
-        panel.add(functionalWhenUnactivatedCheckBox);
+        panel.add(functionalWhenUnactivatedCheckBox, BorderLayout.SOUTH);
         return panel;
     }