hzzz 7 years ago
parent
commit
feef3c586c
  1. 1
      designer_base/src/com/fr/design/constants/UIConstants.java
  2. 2
      designer_base/src/com/fr/design/file/MutilTempalteTabPane.java
  3. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png
  4. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment.png
  5. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_normal.png
  6. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png
  7. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_normal.png
  8. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png
  9. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_normal.png
  10. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png
  11. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal.png
  12. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png
  13. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png
  14. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png
  15. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/shadow.png
  16. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/strikethrough.png
  17. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/sub.png
  18. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/sup.png
  19. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png
  20. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal.png
  21. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png
  22. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal.png
  23. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png
  24. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal.png
  25. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png
  26. 4
      designer_base/src/com/fr/design/utils/ThemeUtils.java

1
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 OCEAN_BLUE = new Color(141, 179, 217);
public static final Color DARK_BLUE = new Color(0, 88, 144); 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(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 SELECT_TAB = new Color(245, 245, 247);
public static final Color TOOLBARUI_BACKGROUND = new Color(255, 255, 255); public static final Color TOOLBARUI_BACKGROUND = new Color(255, 255, 255);
public static final Color SHADOW_GREY = new Color(217, 218, 221); public static final Color SHADOW_GREY = new Color(217, 218, 221);

2
designer_base/src/com/fr/design/file/MutilTempalteTabPane.java

@ -517,7 +517,7 @@ public class MutilTempalteTabPane extends JComponent implements MouseListener, M
generalPath.closePath(); generalPath.closePath();
g2d.fill(generalPath); g2d.fill(generalPath);
g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); 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 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[0], y[0] + CORNOR_RADIUS, x[1], y[1]));
g2d.draw(new Line2D.Double(x[1], y[1], x[2], y[2])); g2d.draw(new Line2D.Double(x[1], y[1], x[2], y[2]));

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/bold.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 287 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 131 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 126 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_center_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 122 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 146 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_left_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 131 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 149 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_right_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 145 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 119 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 115 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

After

Width:  |  Height:  |  Size: 209 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/otherset.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 409 B

After

Width:  |  Height:  |  Size: 456 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/shadow.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 631 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/strikethrough.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 464 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/sub.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 162 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/sup.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 168 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/underline.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

After

Width:  |  Height:  |  Size: 214 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 128 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 124 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 126 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 122 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 130 B

BIN
designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 126 B

4
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 int BUTTON_SPREAD_DARK_DISABLE = 1;
public static final ColorUIResource BACK_COLOR = new ColorUIResource(255, 255, 255); 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_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_DISABLED_COLOR = new ColorUIResource(249, 249, 247);
public static final ColorUIResource SCROLL_TRACK_BORDER_COLOR = new ColorUIResource(234, 231, 218); 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_COLOR = new ColorUIResource(239, 237, 229);
public static final ColorUIResource TOOL_BAR_DARK_COLOR = new ColorUIResource(168, 169, 169); 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_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); public static final ColorUIResource DEFAULT_LIGHT_COLOR = new ColorUIResource(198, 220, 233);

Loading…
Cancel
Save