Merge branch 'release/9.0' of ssh://cloud.finedevelop.com:7999/~hzzz/design into release/9.0

designer_base/src/com/fr/design/constants/UIConstants.java

@@ -74,7 +74,7 @@ public interface UIConstants {
     public static final Color SKY_BLUE = new Color(164, 192, 220);
     public static final Color OCEAN_BLUE = new Color(141, 179, 217);
     public static final Color DARK_BLUE = new Color(0, 88, 144);
-    public static final Color NORMAL_BACKGROUND = new Color(212, 212, 216);
+    public static final Color NORMAL_BACKGROUND = new Color(0xe0e0e3);
     public static final Color TREE_BACKGROUND = new Color(245, 245, 247);
     public static final Color TOOL_PANE_BACKGROUND = new Color(232, 232, 223);
     public static final Color SELECT_TAB = new Color(245, 245, 247);
@@ -111,9 +111,9 @@ public interface UIConstants {
     public static final Color TITLED_BORDER_COLOR = new Color(0xe8e8e9);
     public static final Color GRID_ROW_DETAILS_BACKGROUND = new Color(0xe8e8e9);
     public static final Color GRID_COLUMN_DETAILS_BACKGROUND = GRID_ROW_DETAILS_BACKGROUND;
-    public static final Color TEMPLATE_TAB_PANE_BACKGROUND = new Color(0xe0e0e3);
+    public static final Color TEMPLATE_TAB_PANE_BACKGROUND = NORMAL_BACKGROUND;
     public static final Color LOG_MESSAGE_BAR_BACKGROUND = TEMPLATE_TAB_PANE_BACKGROUND;
-    public static final Color UI_MENU_BACKGOURND = TEMPLATE_TAB_PANE_BACKGROUND;
+    public static final Color UI_MENU_BACKGOURND = LOG_MESSAGE_BAR_BACKGROUND;
     public static final Color POP_DIALOG_BORDER = new Color(218, 218, 221);
     public static final Color PROPERTY_DIALOG_BORDER = new Color(0xc9c9cd);
     public static final Color TAB_BUTTON_HOVER = new Color(231, 230, 235);

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

@@ -255,7 +255,7 @@ public class UIEastResizableContainer extends JPanel {
                         setCursor(Cursor.getDefaultCursor());
                         model = UIConstants.MODEL_NORMAL;
                     }
-                    repaint();
+                    refreshContainer();
                 }
 
                 @Override
@@ -267,7 +267,7 @@ public class UIEastResizableContainer extends JPanel {
                 public void mouseExited(MouseEvent e) {
                     setCursor(Cursor.getDefaultCursor());
                     model = UIConstants.MODEL_NORMAL;
-                    repaint();
+                    refreshContainer();
                 }
 
                 @Override

designer_base/src/com/fr/design/gui/imenu/UIMenu.java

@@ -25,6 +25,7 @@ public class UIMenu extends JMenu {
 
 	public JPopupMenu getPopupMenu() {
 		JPopupMenu popupMenu = super.getPopupMenu();
+		popupMenu.setBackground(UIConstants.NORMAL_BACKGROUND);
 		popupMenu.setBorder(new Border() {
 
 			@Override

designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java

@@ -24,7 +24,7 @@ public class UIMenuBarUI extends BasicMenuBarUI {
             return;
         }
         Color oldColor = g.getColor();
-        g.setColor(UIConstants.TEMPLATE_TAB_PANE_BACKGROUND);
+        g.setColor(UIConstants.UI_MENU_BACKGOURND);
         g.fillRect(0, 0, c.getWidth(), c.getHeight());
         g.setColor(oldColor);
     }

designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java

@@ -19,7 +19,7 @@ public class UIMenuUI extends BasicMenuUI {
         int menuHeight = menuItem.getHeight();
         if (menuItem.isOpaque()) {
             if (menuItem.getParent() instanceof JPopupMenu && model.isSelected()) {
-                g.setColor(UIConstants.NORMAL_BACKGROUND);
+                g.setColor(UIConstants.UI_MENU_BACKGOURND);
                 g.fillRect(0, 0, menuWidth, menuHeight);
                 GUIPaintUtils.fillPaint((Graphics2D) g, 30, 0, menuWidth - 30, menuHeight, true, Constants.NULL, UIConstants.FLESH_BLUE, 7);
             } else if (model.isSelected()) {
@@ -37,7 +37,7 @@ public class UIMenuUI extends BasicMenuUI {
 
     protected void paintPressed(Graphics g, int w, int h) {
         Graphics2D g2d = (Graphics2D) g;
-        g2d.setColor(UIConstants.NORMAL_BACKGROUND);
+        g2d.setColor(UIConstants.UI_MENU_BACKGOURND);
         g2d.fillRect(0, 0, w, h);
         g2d.setColor(UIConstants.LINE_COLOR);
         g2d.drawLine(0, 0, 0, h - 1);

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

@@ -408,7 +408,7 @@ FR-Designer_Current_Preview_Rows=\u73FE\u5728\u306E\u30D7\u30EC\u30D3\u30E5\u30F
 FR-Designer_Data=\u30C7\u30FC\u30BF
 FR-Designer_Error=\u30A8\u30E9\u30FC
 FR-Designer-Website_Url=http\://www.finereport.com/jp
-FR-Designer_formDesignerModule=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9\u30C7\u30B6\u30A4\u30CA\u30FC
+FR-Designer_formDesignerModule=\u610F\u601D\u6C7A\u5B9A\u30EC\u30DD\u30FC\u30C8
 FR-Designer-BBSLogin_Login-Title=BBS\u30ED\u30B0\u30A4\u30F3
 FR-Designer_Get-CubeGetting=cube\u53D6\u5F97
 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u30ED\u30B0\u30A4\u30F3\u3057\u3066\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9

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

@@ -420,7 +420,7 @@ FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u663E\u793A\u63A7\u4EF6
 FR-Designer_Current_Preview_Rows=\u5F53\u524D\u9884\u89C8\u884C\u6570
 FR-Designer_Data=\u6570\u636E
 FR-Designer_Error=\u9519\u8BEF
-FR-Designer_formDesignerModule=\u8868\u5355\u8BBE\u8BA1\u5668\u6A21\u5757
+FR-Designer_formDesignerModule=\u51B3\u7B56\u62A5\u8868\u6A21\u5757
 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

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

@@ -417,7 +417,7 @@ FR-Designer_Event_ShowWidgets=\u76F4\u63A5\u986F\u793A\u5C0F\u5DE5\u5177
 FR-Designer_Current_Preview_Rows=\u7576\u524D\u9810\u89BD\u5217\u6578
 FR-Designer_Data=\u8CC7\u6599
 FR-Designer_Error=\u932F\u8AA4
-FR-Designer_formDesignerModule=\u8868\u55AE\u8A2D\u8A08\u5668\u6A21\u584A
+FR-Designer_formDesignerModule=\u6289\u7B56\u5831\u8868\u6A21\u584A
 FR-Designer-Website_Url=http\://www.finereport.com/tw
 FR-Designer-BBSLogin_Download-Unlogin-Tip=\u767B\u9304\u5F8C\u624D\u80FD\u4E0B\u8F09
 FR-Designer-App_ReLayout=\u624B\u6A5F\u91CD\u4F48\u5C40