diff --git a/designer_base/src/com/fr/design/constants/UIConstants.java b/designer_base/src/com/fr/design/constants/UIConstants.java index 191319f74..b28406cf3 100644 --- a/designer_base/src/com/fr/design/constants/UIConstants.java +++ b/designer_base/src/com/fr/design/constants/UIConstants.java @@ -63,6 +63,7 @@ public interface UIConstants { 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 TOOL_PANE_BACKGROUND = new Color(232, 232, 223); public static final Color SELECT_TAB = new Color(245, 245, 247); public static final Color TOOLBARUI_BACKGROUND = new Color(255, 255, 255); public static final Color SHADOW_GREY = new Color(217, 218, 221); diff --git a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java index 4b461b1ec..d62b64c14 100644 --- a/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java +++ b/designer_base/src/com/fr/design/file/MutilTempalteTabPane.java @@ -517,7 +517,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M generalPath.closePath(); g2d.fill(generalPath); g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); - g2d.setPaint(UIConstants.LINE_COLOR); + g2d.setPaint(new Color(200, 201, 205)); g2d.draw(new Arc2D.Double(x[0], y[0], CORNOR_RADIUS * 2, CORNOR_RADIUS * 2, 90, 90, 0)); g2d.draw(new Line2D.Double(x[0], y[0] + CORNOR_RADIUS, x[1], y[1])); g2d.draw(new Line2D.Double(x[1], y[1], x[2], y[2])); diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png index 34c973ff3..dc86e5ae9 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment.png index c4ff61aa9..11c11afb2 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_normal.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_normal.png index 8398d0ffc..f55df1888 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_normal.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_normal.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png index b63f2a548..3c1846aa6 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_normal.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_normal.png index d26903d8c..3071a703f 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_normal.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_normal.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png index 114702eb2..b8e217bc8 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_normal.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_normal.png index 58d2a543b..c9cd1b9d4 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_normal.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_normal.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png index 0d128b237..1e28bebfb 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal.png index 33eda983b..90582285a 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png index c37f86cd3..60e87418b 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png index 6b36a5c1a..d4088b579 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png index fd49ff53a..cdef0467c 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/shadow.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/shadow.png index be4b61116..57fb317cf 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/shadow.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/shadow.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/strikethrough.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/strikethrough.png index 99b782014..19ad4929c 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/strikethrough.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/strikethrough.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/sub.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/sub.png index f67f1ca5f..aef8b4c82 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/sub.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/sub.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/sup.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/sup.png index 197f75e8b..659027276 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/sup.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/sup.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png index b34e75009..3e4426448 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal.png index a3a1129e9..416c84393 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png index c159c08c0..e5fd1c3f1 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal.png index c48cffa9c..30ee62caa 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png index eb33069c3..f8cf61f66 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal.png index b7fe98602..62c2230b2 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png index 11cc05ebe..d19688ccf 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png differ diff --git a/designer_base/src/com/fr/design/utils/ThemeUtils.java b/designer_base/src/com/fr/design/utils/ThemeUtils.java index 402237ad8..05c726713 100644 --- a/designer_base/src/com/fr/design/utils/ThemeUtils.java +++ b/designer_base/src/com/fr/design/utils/ThemeUtils.java @@ -50,7 +50,7 @@ public class ThemeUtils { public static final int BUTTON_SPREAD_DARK_DISABLE = 1; public static final ColorUIResource BACK_COLOR = new ColorUIResource(255, 255, 255); - public static final ColorUIResource TOOL_SEP_DARK_COLOR = new ColorUIResource(167, 167, 163); + public static final ColorUIResource TOOL_SEP_DARK_COLOR = new ColorUIResource(220, 220, 220); public static final ColorUIResource SCROLL_TRACK_COLOR = new ColorUIResource(249, 249, 247); public static final ColorUIResource SCROLL_TRACK_DISABLED_COLOR = new ColorUIResource(249, 249, 247); public static final ColorUIResource SCROLL_TRACK_BORDER_COLOR = new ColorUIResource(234, 231, 218); @@ -109,7 +109,7 @@ public class ThemeUtils { public static final ColorUIResource TOOL_BAR_COLOR = new ColorUIResource(239, 237, 229); public static final ColorUIResource TOOL_BAR_DARK_COLOR = new ColorUIResource(168, 169, 169); public static final ColorUIResource TOOL_GRIP_LIGHT_COLOR = new ColorUIResource(255, 255, 255); - public static final ColorUIResource TOOL_GRIP_DARK_COLOR = new ColorUIResource(167, 167, 163); + public static final ColorUIResource TOOL_GRIP_DARK_COLOR = new ColorUIResource(220, 220, 220); public static final ColorUIResource DEFAULT_LIGHT_COLOR = new ColorUIResource(198, 220, 233);