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

designer/src/com/fr/design/report/freeze/RepeatAndFreezeSettingPane.java

@@ -8,12 +8,14 @@ import javax.swing.*;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import com.fr.base.FRContext;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.extra.WebDialog;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.env.RemoteEnv;
 import com.fr.general.Inter;
 import com.fr.page.ReportPageAttrProvider;
 import com.fr.stable.ColumnRow;
@@ -211,13 +213,13 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         JPanel freezePanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
 
         //自适应插件
-        JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Attention"));
+        if (shouldShowTip()) {
-
+            JPanel infoPane = FRGUIPaneFactory.createTitledBorderPane(Inter.getLocText("FR-Designer_Attention"));
-        BoxCenterAligmentPane actionLabel = getURLActionLabel(Inter.getLocText("FR-Designer_Form-Fit-Tip"));
+            BoxCenterAligmentPane actionLabel = getURLActionLabel(Inter.getLocText("FR-Designer_Form-Fit-Tip"));
-        infoPane.add(actionLabel, BorderLayout.SOUTH);
+            infoPane.add(actionLabel, BorderLayout.SOUTH);
-
+            this.add(infoPane, BorderLayout.SOUTH);
+        }
         outfreezePanel.add(freezePanel);
-        this.add(infoPane, BorderLayout.SOUTH);
         // 重复打印部分
         // 重复打印标题的起始行
         JPanel labelPanel = FRGUIPaneFactory.createNormalFlowInnerContainer_S_Pane();
@@ -241,6 +243,10 @@ public class RepeatAndFreezeSettingPane extends BasicPane {
         initWriteListener();
     }
 
+    private boolean shouldShowTip() {
+        return !(FRContext.getCurrentEnv() instanceof RemoteEnv) && FRContext.isChineseEnv();
+    }
+
     protected void initWriteListener() {
         // 填报重复冻结行
         useWriteFrozenCCheckBox.addChangeListener(useWriteFrozenCListener);

designer_base/src/com/fr/design/extra/PluginWebBridge.java

@@ -529,17 +529,6 @@ public class PluginWebBridge {
         return LoginWebBridge.getHelper().pluginManageLogin(username, password, uiLabel);
     }
 
-    /**
-     * 插件管理部分的登陆的回调处理
-     * @param username
-     * @param password
-     * @param callback
-     */
-    public void defaultLogin(String username, String password, final JSObject callback) {
-        Task<Void> task = new PluginTask<>(webEngine, callback, new PluginLoginExecutor(username, password, uiLabel));
-        new Thread(task).start();
-    }
-
     /**
      * 弹出QQ授权页面
      */
@@ -556,4 +545,4 @@ public class PluginWebBridge {
         DesignerEnvManager.getEnvManager().setInShowBBsName(StringUtils.EMPTY);
         uiLabel.setText(Inter.getLocText("FR-Base_UnSignIn"));
     }
-}
+}