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

designer/src/com/fr/design/mainframe/bbs/UserInfoPane.java

@@ -77,12 +77,11 @@ public class UserInfoPane extends BasicPane{
 			@Override
 			public void run() {
 				String username = DesignerEnvManager.getEnvManager().getBBSName();
-				String password = DesignerEnvManager.getEnvManager().getBBSPassword();
+				String inShowUsername = DesignerEnvManager.getEnvManager().getInShowBBsName();
-				String loginResult = LoginWebBridge.getHelper().login(username, password);
+				if (StringUtils.isEmpty(username) && StringUtils.isEmpty(inShowUsername)){
-				if (loginResult.equals(LOGININ)) {
-					markSignIn(username);
-				}else {
 					markUnSignIn();
+				} else {
+					markSignIn(username);
 				}
 			}
 		});

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

@@ -117,7 +117,7 @@ public class QQLoginWebBridge {
             //账号没有QQ授权
             closeQQWindow();
             try {
-                Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("bbs.default")));
+                Desktop.getDesktop().browse(new URI(SiteCenter.getInstance().acquireUrlByKind("QQ_binding")));
             }catch (Exception exp) {
             }
         }

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

@@ -192,7 +192,7 @@ public class FormParaWidgetPane extends JPanel{
         }
         labelPane.add(label,BorderLayout.CENTER);
         reportPane.add(labelPane,BorderLayout.SOUTH);
-        reportPane.setPreferredSize(new Dimension((int)jComponent.getPreferredSize().getWidth(),(int)reportPane.getPreferredSize().getHeight()));
+        reportPane.setPreferredSize(new Dimension((int)reportPane.getPreferredSize().getWidth(),(int)reportPane.getPreferredSize().getHeight()));
         return reportPane;
     }