diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index aa27ea2ec..3df47f30a 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/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); diff --git a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java b/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java index f5d7f23f5..81b291f41 100644 --- a/designer_base/src/com/fr/design/gui/icontainer/UIEastResizableContainer.java +++ b/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 diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java b/designer_base/src/com/fr/design/gui/imenu/UIMenu.java index ecce5059c..9c905a83f 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenu.java +++ b/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 diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java index 04d5d3b0b..3fe90dc98 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuBarUI.java +++ b/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); } diff --git a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java b/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java index fdda1a612..9e79ecd65 100644 --- a/designer_base/src/com/fr/design/gui/imenu/UIMenuUI.java +++ b/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); diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png index 3e1035333..49bd32545 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png index d2e0a2b43..0d6fb5dc7 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png index c4b71b853..6485213d8 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png index 7ea07bb9a..d70849841 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png index 73ee5b87a..d70849841 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png index 87c812f79..562300d4a 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png index 2e450c35b..b82ef7fd0 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png index 22fb4eb68..c87076aa7 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png index 11e5aefbf..8067e295f 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png index 70b2dbd9b..4e97bb9ba 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png index 14ff765e4..f80c5683f 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png index 082dce2e8..3287573a9 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png index 136dc6568..3c41b0ad8 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png index 1cbf98153..b2f8221b2 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png index f9cea74c9..527f2fb39 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png index 552597755..0f2bd67bd 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png index a84c636d3..ec3bffbbc 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png index 477e9d448..3547eb694 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png index cde4d783a..edbf8ae1d 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png index b81a666d5..9c48ffdcb 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png index 80135b046..96845bf6c 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png index ac9163d6c..8cfb4dbca 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png index 38979ca5f..8e1bc886b 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png index 88315dc20..f8cfde0a0 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png new file mode 100644 index 000000000..e75e2f461 Binary files /dev/null and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_disabled.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png index f67375cde..e84ac6361 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png differ diff --git a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png index c36f293f9..31e5ec6c0 100644 Binary files a/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png and b/designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png differ diff --git a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties b/designer_base/src/com/fr/design/locale/designer_ja_JP.properties index d1ea8fbd0..fb4812357 100644 --- a/designer_base/src/com/fr/design/locale/designer_ja_JP.properties +++ b/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 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties b/designer_base/src/com/fr/design/locale/designer_zh_CN.properties index 984a94a54..16298f5e5 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_CN.properties +++ b/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 diff --git a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties b/designer_base/src/com/fr/design/locale/designer_zh_TW.properties index 997342c7f..898c1fb3c 100644 --- a/designer_base/src/com/fr/design/locale/designer_zh_TW.properties +++ b/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