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

designer/src/com/fr/design/mainframe/CellWidgetPropertyPane.java

@@ -102,31 +102,41 @@ public class CellWidgetPropertyPane extends BasicPane {
     }
 
     public void update() {
-        if (cellElement == null) {// 利用默认的CellElement.
+        if (cellElement == null || !cellEditorDefPane.isShouldFireSelectedEvent()) {
             return;
         }
         final CellSelection finalCS = (CellSelection) ePane.getSelection();
         final TemplateElementCase tplEC = ePane.getEditingElementCase();
-        ReportActionUtils.actionIterateWithCellSelection(finalCS, tplEC, new ReportActionUtils.IterAction() {
+        if(finalCS.isSelectedOneCell(ePane)){
-            public void dealWith(CellElement editCellElement) {
+            if(tplEC.getTemplateCellElement(cellElement.getColumn(), cellElement.getRow())== null){//cellElement未加入到report中时要添加进去
-                Widget cellWidget = cellEditorDefPane.update();
+                tplEC.addCellElement(cellElement);
-                // p:最后把这个cellEditorDef设置到CellGUIAttr.
-                TemplateCellElement cellElement = (TemplateCellElement) editCellElement;
-                if (cellWidget instanceof NoneWidget) {
-                    cellElement.setWidget(null);
-                } else {
-                    if (cellElement.getWidget() != null) {
-                        cellWidget = upDateWidgetAuthority(cellElement, cellWidget);
-                    }
-                    cellElement.setWidget(cellWidget);
-                }
             }
-        });
+            setCellWidget(cellElement);
+        }else{
+            ReportActionUtils.actionIterateWithCellSelection(finalCS, tplEC, new ReportActionUtils.IterAction() {
+                public void dealWith(CellElement editCellElement) {
+                    // p:最后把这个cellEditorDef设置到CellGUIAttr.
+                    TemplateCellElement templateCellElement = (TemplateCellElement) editCellElement;
+                    setCellWidget(templateCellElement);
+                }
+            });
+        }
         if(DesignerContext.getDesignerFrame().getSelectedJTemplate() != null){
             DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified();
         }
     }
 
+    private void setCellWidget(TemplateCellElement cellElement){
+        Widget cellWidget = cellEditorDefPane.update();
+        if (cellWidget instanceof NoneWidget) {
+            cellElement.setWidget(null);
+        } else {
+            if (cellElement.getWidget() != null) {
+                cellWidget = upDateWidgetAuthority(cellElement, cellWidget);
+            }
+            cellElement.setWidget(cellWidget);
+        }
+    }
 
     public void reInitAllListener(){
         cellEditorDefPane.registerListener();

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

@@ -1,59 +1,69 @@
 /**
- * 
+ *
  */
 package com.fr.design.mainframe.bbs;
 
 import com.fr.general.IOUtils;
+import com.fr.general.SiteCenter;
 import com.fr.stable.StringUtils;
 
 import java.util.Properties;
 
 /**
  * @author neil
- *
  * @date: 2015-3-10-上午9:50:13
  */
 public class BBSConstants {
 
     //判断是否更新的关键字
     public static final String UPDATE_KEY = loadAttribute("UPDATE_KEY", "newIsPopup");
-   
+
-
+
-	private static final String GUEST_KEY = "USER";
+    private static final String GUEST_KEY = "USER";
-	private static final String LINK_KEY = "LINK";
+    private static final String GUEST_KEY_ONLINE = "guest.user";
-	private static final int GUEST_NUM = 5;
+    private static final String LINK_KEY = "LINK";
-	
+    private static final String LINK_KEY_ONLINE = "guest.link";
-	//用户名信息数组
+
-	public static final String[] ALL_GUEST = loadAllGuestsInfo(GUEST_KEY);
+    private static Properties PROP = null;
-	//用户论坛链接信息
+
-	public static final String[] ALL_LINK = loadAllGuestsInfo(LINK_KEY);
+    public static String[] getAllGuest() {
-	
+        return loadAllGuestsInfoOnline(GUEST_KEY_ONLINE, loadAllGuestsInfo(GUEST_KEY));
-	private static Properties PROP = null;
+    }
-	
+
-	//加载所有用户的信息, 用户名, 论坛连接
+    public static String[] getAllLink() {
-	private static String[] loadAllGuestsInfo(String key){
+        return loadAllGuestsInfoOnline(LINK_KEY_ONLINE, loadAllGuestsInfo(LINK_KEY));
-		String[] allGuests = new String[GUEST_NUM];
+    }
-		for (int i = 0; i < GUEST_NUM; i++) {
+
-			allGuests[i] = loadAttribute(key + i, StringUtils.EMPTY);
+    //加载所有用户的信息, 用户名, 论坛连接
-		}
+    private static String loadAllGuestsInfo(String key) {
-		
+        return loadAttribute(key, StringUtils.EMPTY);
-		return allGuests;
+    }
-	}
+
-	//如果要定制, 直接改bbs.properties就行了
+    //加载所有用户的信息, 用户名, 论坛连接
-	private static String loadAttribute(String key, String defaultValue) {
+    private static String[] loadAllGuestsInfoOnline(String key, String defaultValue) {
-		if (PROP == null) {
+        String[] allGuests = new String[0];
-			PROP = new Properties();
+        String guest = SiteCenter.getInstance().acquireUrlByKind(key, defaultValue);
-			try {
+        if (StringUtils.isNotEmpty(guest)) {
-				PROP.load(IOUtils.getResourceAsStream("/com/fr/design/mainframe/bbs/bbs.properties", BBSConstants.class));
+            allGuests = guest.split("\\|");
-			} catch (Exception e) {
+        }
-			}
+        return allGuests;
-		}
+    }
-
+    
-		String p = PROP.getProperty(key);
+    //如果要定制, 直接改bbs.properties就行了
-		if (StringUtils.isEmpty(p)) {
+    private static String loadAttribute(String key, String defaultValue) {
-			p = defaultValue;
+        if (PROP == null) {
-		}
+            PROP = new Properties();
-		return p;
+            try {
-	}
+                PROP.load(IOUtils.getResourceAsStream("/com/fr/design/mainframe/bbs/bbs.properties", BBSConstants.class));
-	
+            } catch (Exception e) {
+            }
+        }
+
+        String p = PROP.getProperty(key);
+        if (StringUtils.isEmpty(p)) {
+            p = defaultValue;
+        }
+        return p;
+    }
+
 }

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

@@ -3,15 +3,6 @@
  */
 package com.fr.design.mainframe.bbs;
 
-import java.awt.BorderLayout;
-import java.awt.Component;
-import java.awt.Desktop;
-import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
-import java.net.URI;
-
-import javax.swing.JPanel;
-
 import com.fr.design.gui.ilable.ActionLabel;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -21,6 +12,12 @@ import com.fr.general.Inter;
 import com.fr.stable.StringUtils;
 import com.fr.start.BBSGuestPaneProvider;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.net.URI;
+
 /**
  * @author neil
  *
@@ -54,9 +51,12 @@ public class BBSGuestPane extends JPanel implements BBSGuestPaneProvider{
 		double[] colSize = {p};
 		
 		Component[][] components = new Component[rowSize.length][colSize.length];
-		for (int i = 0; i < components.length; i++) {
+		String[] allGuest = BBSConstants.getAllGuest();
-			String userName = BBSConstants.ALL_GUEST[i];
+		String[] allLink = BBSConstants.getAllLink();
-			String url = BBSConstants.ALL_LINK[i];
+		int min = Math.min(allGuest.length, components.length);
+		for (int i = 0; i < min; i++) {
+			String userName = allGuest[i];
+			String url = allLink[i];
 			components[i][0] = getURLActionLabel(userName, url);
 		}
 		

designer/src/com/fr/design/mainframe/bbs/bbs.properties

@@ -4,16 +4,8 @@ COLLECT_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=colle
 DEFAULT_URL=http\://bbs.finereport.com/home.php?mod=space&do=notice
 GET_MESSAGE_URL=http://feedback.finedevelop.com:3000/bbs/message/count
 GET_SIGN_INFO_URL=http\://bbs.finereport.com
-LINK0=http\://bbs.finereport.com/space-uid-55823.html
+LLINK= http\://bbs.fanruan.com/home.php?mod=space&uid=66470&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=67190&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=65659&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=60352&do=profile|http\://bbs.fanruan.com/home.php?mod=space&uid=78157&do=profile
-LINK1=http\://bbs.finereport.com/space-uid-56940.html
-LINK2=http\://bbs.finereport.com/space-uid-51621.html
-LINK3=http\://bbs.finereport.com/space-uid-52618.html
-LINK4=http\://bbs.finereport.com/space-uid-48993.html
 SHARE_URL=http\://bbs.finereport.com
-USER0=\u6590\u6CE2\u90A3\u5951(\u5B59\u70B3\u6DA6)
+UUSER=cherishdqy\uFF08\u9093\u79CB\u4E91\uFF09|yets11\uFF08\u9676\u5B5D\u6587\uFF09|\u661F\u75D5\uFF08\u71D5\u5B8F\u4F1F\uFF09|\u9759\u542C\u7985\u9E23\uFF08\u674E\u51A0\u519B\uFF09|yiyemeiying\uFF08\u5218\u4F73\uFF09
-USER1=deafire(\u674E\u5FD7\u4F1F)
-USER2=\u963F\u8FEA(\u8C22\u8FEA)
-USER3=bingjie(\u5F20\u8BB0\u82B1)
-USER4=\u6D77\u7EF5\u5B9D\u5B9D(\u90DD\u6B63)
 VERIFY_URL=http://www.finereporthelp.com:8081/bbs/ReportServer?op=bbs&cmd=verify
 UPDATE_INFO_URL=http://bbs.finereport.com/source/plugin/infor/infor.html

designer/src/com/fr/design/mainframe/errorinfo/ErrorInfoUploader.java

@@ -159,7 +159,7 @@ public class ErrorInfoUploader {
         try {
             success = ComparatorUtils.equals(new JSONObject(res).get("status"), "success");
         } catch (Exception ex) {
-            success = false;
+            success = true;
         }
         return success;
     }

designer/src/com/fr/design/widget/WidgetPane.java

@@ -47,6 +47,12 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
         this.initComponents(pane);
     }
 
+
+    public boolean isShouldFireSelectedEvent(){
+        return shouldFireSelectedEvent;
+    }
+
+
     protected void initComponents(ElementCasePane pane) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
         this.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
@@ -136,8 +142,8 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
             String name = ((NameWidget) widget).getName();
             shouldFireSelectedEvent = false;
             editorTypeComboBox.setSelectedItem(new Item(name, name));
-            shouldFireSelectedEvent = true;
             cellEditorCardPane.populate(widget);
+            shouldFireSelectedEvent = true;
         }
         // 内置组件
         else {
@@ -145,10 +151,9 @@ public class WidgetPane extends AbstractAttrNoScrollPane implements ItemListener
             if (ArrayUtils.contains(ButtonConstants.CLASSES4BUTTON, clazz)) {
                 clazz = Button.class;
             }
-            cellEditorCardPane.populate(widget);
-
             shouldFireSelectedEvent = false;
             editorTypeComboBox.setSelectedItemByWidgetClass(clazz);
+            cellEditorCardPane.populate(widget);
             shouldFireSelectedEvent = true;
         }
         removeAttributeChangeListener();

designer/src/com/fr/start/ReportSplashPane.java

@@ -1,5 +1,5 @@
 /**
- * 
+ *
  */
 package com.fr.start;
 
@@ -8,6 +8,7 @@ import com.fr.base.FRContext;
 import com.fr.base.GraphHelper;
 import com.fr.design.mainframe.bbs.BBSConstants;
 import com.fr.general.GeneralContext;
+import com.fr.general.Inter;
 import com.fr.general.ModuleContext;
 import com.fr.stable.Constants;
 import com.fr.stable.CoreGraphHelper;
@@ -27,36 +28,37 @@ import java.util.TimerTask;
 
 /**
  * @author neil
- *
  * @date: 2015-3-13-上午9:47:58
  */
-public class ReportSplashPane extends SplashPane{
+public class ReportSplashPane extends SplashPane {
-	
+
-	private static final String OEM_PATH = "/com/fr/base/images/oem";
+    private static final String OEM_PATH = "/com/fr/base/images/oem";
-	private static final String SPLASH_CN = "splash_chinese.png";
+    private static final String SPLASH_MAC_CN = "splash_chinese_mac.png";
-	private static final String SPLASH_EN = "splash_english.png";
+    private static final String SPLASH_MAC_EN = "splash_english_mac.png";
-	private static final String SPLASH_MAC_CN = "splash_chinese_mac.png";
+
-	private static final String SPLASH_MAC_EN = "splash_english_mac.png";
+    private static final Color MODULE_COLOR = new Color(230, 230, 230);
-	
-	private static final Color MODULE_COLOR = new Color(230, 230, 230);
     private static final int MODULE_INFO_X = 25;
     private static final int MODULE_INFO_Y = 270;
-    
+
     private static final Color THANK_COLOR = new Color(72, 216, 249);
     private static final int THANK_INFO_X = 460;
-    
+
     private static final String GUEST = getRandomUser();
-	
+
     private String showText = "";
-    
+
     private String moduleID = "";
     private int loadingIndex = 0;
     private String[] loading = new String[]{"..", "....", "......"};
     private java.util.Timer timer = new java.util.Timer();
 
     public ReportSplashPane() {
+        init();
+    }
+
+    private void init() {
         this.setBackground(null);
-        
+
         timer.schedule(new TimerTask() {
             public void run() {
                 loadingIndex++;
@@ -64,19 +66,18 @@ public class ReportSplashPane extends SplashPane{
                 ReportSplashPane.this.repaint();
             }
         }, 0, 300);
-        
+
+        ModuleListener moduleListener = new ModuleAdapter() {
+            @Override
+            public void onStartBefore(String moduleName, String moduleI18nName) {
+                moduleID = moduleI18nName;
+                loadingIndex++;
+                ReportSplashPane.this.setShowText(moduleID.isEmpty() ? StringUtils.EMPTY : moduleID + loading[loadingIndex % 3]);
+                ReportSplashPane.this.repaint();
+            }
+        };
         ModuleContext.registerModuleListener(moduleListener);
     }
-    
-    private ModuleListener moduleListener = new ModuleAdapter() {
-        @Override
-        public void onStartBefore(String moduleName, String moduleI18nName) {
-            moduleID = moduleI18nName;
-            loadingIndex++;
-            ReportSplashPane.this.setShowText(moduleID.isEmpty() ? StringUtils.EMPTY : moduleID + loading[loadingIndex % 3]);
-            ReportSplashPane.this.repaint();
-        }
-    };
 
     protected void paintComponent(Graphics g) {
         super.paintComponent(g);
@@ -104,8 +105,8 @@ public class ReportSplashPane extends SplashPane{
 
         return splashBuffedImage;
     }
-    
+
-    private void paintShowText(Graphics2D splashG2d){
+    private void paintShowText(Graphics2D splashG2d) {
         FontRenderContext fontRenderContext = splashG2d.getFontRenderContext();
         LineMetrics fm = splashG2d.getFont().getLineMetrics("",
                 fontRenderContext);
@@ -119,6 +120,13 @@ public class ReportSplashPane extends SplashPane{
         //加载模块信息
         double y = MODULE_INFO_Y + height + leading + ascent;
         GraphHelper.drawString(splashG2d, showText, MODULE_INFO_X, y);
+
+        //每次随机感谢一位论坛用户
+        if (shouldShowThanks()) {
+            splashG2d.setPaint(THANK_COLOR);
+            String content = Inter.getLocText("FR-Designer_Thanks-To") + GUEST;
+            GraphHelper.drawString(splashG2d, content, THANK_INFO_X, y);
+        }
     }
 
     // 是否显示鸣谢文字
@@ -131,38 +139,37 @@ public class ReportSplashPane extends SplashPane{
         }
         return true;
     }
-    
+
-    private static String getRandomUser(){
+    private static String getRandomUser() {
-    	int num = new Random().nextInt(BBSConstants.ALL_GUEST.length);
+        String[] allGuest = BBSConstants.getAllGuest();
-    	return StringUtils.BLANK + BBSConstants.ALL_GUEST[num];
+        if (allGuest.length == 0) {
+            return StringUtils.EMPTY;
+        }
+        int num = new Random().nextInt(allGuest.length);
+        return StringUtils.BLANK + allGuest[num];
     }
-    
+
     /**
-	 * 窗口关闭后取消定时获取模块信息的timer
+     * 窗口关闭后取消定时获取模块信息的timer
-	 * 
+     */
-	 */
+    public void releaseTimer() {
-	public void releaseTimer() {
         timer.cancel();
-	}
-	
-	/**
-	 * 创建启动画面的背景图片
-	 * 
-	 * @return 背景图片
-	 * 
-	 */
-	public Image createSplashBackground() {
-		String fileName = getImageName();
-		return BaseUtils.readImage(StableUtils.pathJoin(OEM_PATH, fileName));
     }
-	
-	//获取图片文件名
-	private String getImageName(){
-		boolean isChina = GeneralContext.isChineseEnv();
-        //jdk1.8下透明有bug, 设置了setWindowTransparent后, JFrame直接最小化了, 先用mac下的加载图片
-        return isChina ? SPLASH_MAC_CN : SPLASH_MAC_EN;
-	}
 
+    /**
+     * 创建启动画面的背景图片
+     *
+     * @return 背景图片
+     */
+    public Image createSplashBackground() {
+        String fileName = getImageName();
+        return BaseUtils.readImage(StableUtils.pathJoin(OEM_PATH, fileName));
+    }
 
-	
+    //获取图片文件名
-}
+    private String getImageName() {
+        boolean isChina = GeneralContext.isChineseEnv();
+        //jdk1.8下透明有bug, 设置了setWindowTransparent后, JFrame直接最小化了, 先用mac下的加载图片
+        return isChina ? SPLASH_MAC_CN : SPLASH_MAC_EN;
+    }
+}

designer_base/src/com/fr/design/actions/file/OpenTemplateAction.java

@@ -22,7 +22,7 @@ public class OpenTemplateAction extends UpdateAction {
         this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE);
         this.setName(getMenuKeySet().getMenuKeySetName());
         this.setMnemonic(getMenuKeySet().getMnemonic());
-        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/open.png"));
+        this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/open.png"));
         this.setAccelerator(getMenuKeySet().getKeyStroke());
     }
 

designer_base/src/com/fr/design/actions/help/AboutPane.java

@@ -34,15 +34,15 @@ public class AboutPane extends JPanel {
     private static final int DEFAULT_GAP = 12;
     private static final String COPYRIGHT_LABEL = "\u00A9 ";
     private static final String BUILD_PREFIX = "  Build #";
-    
+
     public AboutPane() {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         //center panel
-        JPanel centerPane=FRGUIPaneFactory.createBorderLayout_L_Pane();
+        JPanel centerPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         this.add(centerPane, BorderLayout.CENTER);
 
-        JPanel contentPane=FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
+        JPanel contentPane = FRGUIPaneFactory.createY_AXISBoxInnerContainer_L_Pane();
         centerPane.add(contentPane, BorderLayout.NORTH);
 
         BoxCenterAlignmentCopyablePane buildCopyPane = new BoxCenterAlignmentCopyablePane(
@@ -68,8 +68,8 @@ public class AboutPane extends JPanel {
                         Inter.getLocText("FR-Designer-Basic_Activation_Key_Copy_OK")
                 }));
 
-        if (shouldShowPhoneAndQQ()){
+        if (shouldShowPhoneAndQQ()) {
-            if(ComparatorUtils.equals(ProductConstants.APP_NAME,FINEREPORT)){
+            if (ComparatorUtils.equals(ProductConstants.APP_NAME, FINEREPORT)) {
                 boxCenterAlignmentPane = new BoxCenterAligmentPane(Inter.getLocText("FR-Designer_Service_Phone") + ProductConstants.COMPARE_TELEPHONE);
                 contentPane.add(boxCenterAlignmentPane);
             }
@@ -79,15 +79,19 @@ public class AboutPane extends JPanel {
 
         BoxCenterAligmentPane actionLabel = getURLActionLabel(SiteCenter.getInstance().acquireUrlByKind("website." + FRContext.getLocale(), ProductConstants.WEBSITE_URL));
         BoxCenterAligmentPane emailLabel = getEmailActionLabel(SiteCenter.getInstance().acquireUrlByKind("support.email", ProductConstants.SUPPORT_EMAIL));
-        
+
         contentPane.add(actionLabel);
         contentPane.add(emailLabel);
+        if (shouldShowThanks()) {
+            addThankPane(contentPane);
+        }
     }
 
     // 是否显示服务电话和 qq
     private boolean shouldShowPhoneAndQQ() {
         return !FRContext.getLocale().equals(Locale.US);
     }
+
     // 是否显示鸣谢面板
     private boolean shouldShowThanks() {
         Locale[] hideLocales = {Locale.US, Locale.KOREA, Locale.JAPAN};
@@ -98,40 +102,40 @@ public class AboutPane extends JPanel {
         }
         return true;
     }
-    
+
     //添加鸣谢面板
-    private void addThankPane(JPanel contentPane){
+    private void addThankPane(JPanel contentPane) {
         BBSGuestPaneProvider pane = StableFactory.getMarkedInstanceObjectFromClass(BBSGuestPaneProvider.XML_TAG, BBSGuestPaneProvider.class);
-        if(pane == null){
+        if (pane == null) {
-        	return;
+            return;
         }
 
         contentPane.add(Box.createVerticalStrut(DEFAULT_GAP));
         contentPane.add((Component) pane);
     }
-    
+
-    private String append(String...strs){
+    private String append(String... strs) {
-    	StringBuilder sb = new StringBuilder();
+        StringBuilder sb = new StringBuilder();
-    	for(String str : strs){
+        for (String str : strs) {
-    		sb.append(str);
+            sb.append(str);
-    	}
+        }
-    	
+
-    	return sb.toString();
+        return sb.toString();
     }
-    
+
-    private String getCopyRight(){
+    private String getCopyRight() {
-       return append(Inter.getLocText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL,
+        return append(Inter.getLocText("FR-Designer_About_CopyRight"), COPYRIGHT_LABEL,
-    		   ProductConstants.HISTORY, StringUtils.BLANK, SiteCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME));
+                ProductConstants.HISTORY, StringUtils.BLANK, SiteCenter.getInstance().acquireUrlByKind("company.name", ProductConstants.COMPANY_NAME));
     }
 
     private String getBuildTitle() {
         return append(ProductConstants.APP_NAME, Inter.getLocText("FR-Designer_About_Version"),
                 StringUtils.BLANK, ProductConstants.RELEASE_VERSION, BUILD_PREFIX);
     }
-    
+
-    private BoxCenterAligmentPane getEmailActionLabel(final String mailTo){
+    private BoxCenterAligmentPane getEmailActionLabel(final String mailTo) {
         ActionLabel emailLabel = new ActionLabel(mailTo);
-        
+
         emailLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -142,12 +146,12 @@ public class AboutPane extends JPanel {
                 }
             }
         });
-        
+
         return new BoxCenterAligmentPane(emailLabel);
     }
-    
+
-    private BoxCenterAligmentPane getURLActionLabel(final String url){
+    private BoxCenterAligmentPane getURLActionLabel(final String url) {
-    	ActionLabel actionLabel = new ActionLabel(url);
+        ActionLabel actionLabel = new ActionLabel(url);
         actionLabel.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {
@@ -158,7 +162,7 @@ public class AboutPane extends JPanel {
                 }
             }
         });
-        
+
         return new BoxCenterAligmentPane(actionLabel);
     }
 
@@ -184,7 +188,7 @@ public class AboutPane extends JPanel {
     class BoxCenterAligmentPane extends JPanel {
 
         private UILabel textLabel;
-    	
+
         public BoxCenterAligmentPane(String text) {
             this(new UILabel(text));
         }

designer_base/src/com/fr/design/gui/controlpane/JListControlPane.java

@@ -360,7 +360,7 @@ public abstract class JListControlPane extends JControlPane {
             this.creator = creators[0];
             this.setName(Inter.getLocText("FR-Action_Add"));
             this.setMnemonic('A');
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
+            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
 
         @Override

designer_base/src/com/fr/design/gui/controlpane/UIListControlPane.java

@@ -447,7 +447,7 @@ public abstract class UIListControlPane extends UIControlPane {
             this.creator = creators[0];
             this.setName(Inter.getLocText("FR-Action_Add"));
             this.setMnemonic('A');
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/base/images/cell/control/add.png"));
+            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/add.png"));
         }
 
         /**

designer_base/src/com/fr/design/gui/icombobox/FunctionComboBox.java

@@ -60,7 +60,7 @@ public class FunctionComboBox extends UIComboBox {
 
 			if (value instanceof DataFunction) {
 				DataFunction function = (DataFunction) value;
-				this.setText(DataCoreUtils.getFunctionDisplayName(function));
+				this.setText(" " + DataCoreUtils.getFunctionDisplayName(function));
 			}
 
 			return this;

designer_base/src/com/fr/design/gui/icombobox/UIComboBoxUI.java

@@ -67,9 +67,9 @@ public class UIComboBoxUI extends BasicComboBoxUI implements MouseListener {
         }
         g2d.setColor(linecolor);
         if (!comboBox.isPopupVisible()) {
-            g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.LARGEARC, UIConstants.LARGEARC);
+            g2d.drawRoundRect(0, 0, c.getWidth() - arrowButton.getWidth() + 3, c.getHeight() - 1, UIConstants.ARC, UIConstants.ARC);
         } else {
-            g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.LARGEARC, UIConstants.LARGEARC);
+            g2d.drawRoundRect(0, 0, c.getWidth(), c.getHeight() + 3, UIConstants.ARC, UIConstants.ARC);
             g2d.drawLine(0, c.getHeight() - 1, c.getWidth(), c.getHeight() - 1);
         }
     }

designer_base/src/com/fr/design/gui/icontainer/UIScrollPaneUI.java

@@ -36,13 +36,11 @@ public class UIScrollPaneUI extends MetalScrollPaneUI implements PropertyChangeL
         // Note: It never happened before Java 1.5 that scrollbar is null
         JScrollBar sb = scrollpane.getHorizontalScrollBar();
         if (sb != null) {
-            sb.setBackground(Color.red);
             sb.putClientProperty(MetalScrollBarUI.FREE_STANDING_PROP, Boolean.FALSE);
         }
 
         sb = scrollpane.getVerticalScrollBar();
         if (sb != null) {
-            sb.setBackground(Color.red);
             sb.putClientProperty(MetalScrollBarUI.FREE_STANDING_PROP, Boolean.FALSE);
         }
     }

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

@@ -183,7 +183,7 @@ FR-Designer_Support_QQ=\u6280\u672FQQ
 FR-Designer_Swatch=\u6837\u54C1
 FR-Designer_Tab_title=tab\u6807\u9898
 FR-Designer_TableData=\u6570\u636E\u96C6
-FR-Designer_Thank_guest=\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u8BBA\u575B\u5E06\u85AF\u5BF9\u8BE5\u7248\u672C\u8BBE\u8BA1\u5668\u6613\u7528\u6027\u505A\u51FA\u7684\u7A81\u51FA\u8D21\u732E
+FR-Designer_Thank_guest=\u7279\u522B\u9E23\u8C22\u4EE5\u4E0B\u756A\u85AF\u5BF9\u5E06\u8F6F\u4EA7\u54C1\u3001\u6587\u5316\u3001\u751F\u6001\u5EFA\u8BBE\u505A\u51FA\u7684\u7A81\u51FA\u8D21\u732E
 FR-Designer_Thanks-To=\u9E23\u8C22
 FR-Designer_Title=\u6807\u9898
 FR-Designer_Total=\u603B\u5171

designer_base/src/com/fr/design/mainframe/DesignerFrameFileDealerPane.java

@@ -171,7 +171,7 @@ public class DesignerFrameFileDealerPane extends JPanel implements FileToolbarSt
 
         public OpenReportAction() {
             this.setName(KeySetUtils.OPEN_TEMPLATE.getMenuKeySetName());
-            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/open.png"));
+            this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/open.png"));
         }
 
         @Override

designer_base/src/com/fr/start/BaseDesigner.java

@@ -27,6 +27,7 @@ import com.fr.general.FRLogger;
 import com.fr.general.GeneralContext;
 import com.fr.general.Inter;
 import com.fr.general.ModuleContext;
+import com.fr.general.SiteCenter;
 import com.fr.plugin.PluginCollector;
 import com.fr.plugin.manage.PluginManager;
 import com.fr.plugin.manage.PluginStartup;
@@ -64,6 +65,8 @@ public abstract class BaseDesigner extends ToolBarMenuDock {
         }
         RestartHelper.deleteRecordFilesWhenStart();
 
+        SiteCenter.getInstance();
+
         DesignUtils.setPort(getStartPort());
         // 如果端口被占用了 说明程序已经运行了一次,也就是说，已经建立一个监听服务器，现在只要给服务器发送命令就好了
         if (DesignUtils.isStarted()) {

designer_chart/src/com/fr/design/mainframe/chart/gui/ChangeConfigPane.java

@@ -114,7 +114,7 @@ public class ChangeConfigPane extends BasicBeanPane<ChartCollection> {
     }
 
     private JPanel createTitleStylePane() {
-        UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT);
+        final UILabel text = new UILabel(Inter.getLocText("Plugin-Chart_Character"), SwingConstants.LEFT);
         styleAttrPane = new ChartTextAttrPane() {
             protected JPanel getContentPane(JPanel buttonPane) {
                 double p = TableLayout.PREFERRED;

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

@@ -21,7 +21,7 @@ import com.fr.design.widget.ui.designer.AbstractDataModify;
 import com.fr.form.ui.container.WParameterLayout;
 import com.fr.general.Background;
 import com.fr.general.Inter;
-import com.fr.stable.Constants;
+import com.fr.report.stable.FormConstants;
 
 import javax.swing.*;
 import java.awt.*;
@@ -82,7 +82,7 @@ public class RootDesignDefinePane extends AbstractDataModify<WParameterLayout> {
         Icon[] hAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
                 BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),};
-        Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};
+        Integer[] hAlignment = new Integer[]{FormConstants.LEFTPOSITION, FormConstants.CENTERPOSITION, FormConstants.RIGHTPOSITION};
         hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
         hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Left")
                 , Inter.getLocText("FR-Designer-StyleAlignment_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Right")});