Browse Source

1 background

master
hzzz 7 years ago
parent
commit
a6a547d36a
  1. 2
      designer/src/com/fr/design/cell/bar/DynamicScrollButton.java
  2. 2
      designer/src/com/fr/design/cell/bar/ScrollBarUIConstant.java
  3. 3
      designer/src/com/fr/design/parameter/ParameterDefinitePane.java
  4. 7
      designer/src/com/fr/grid/GridHeader.java
  5. 3
      designer_base/src/com/fr/design/constants/UIConstants.java
  6. 2
      designer_base/src/com/fr/design/gui/UIDefaultTheme.java
  7. 2
      designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java
  8. 2
      designer_base/src/com/fr/design/gui/itoolbar/UIToolBarUI.java
  9. 2
      designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java
  10. 8
      designer_base/src/com/fr/design/gui/itooltip/UIToolTipUI.java
  11. 8
      designer_base/src/com/fr/design/utils/ThemeUtils.java
  12. 2
      designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAccColorPane.java

2
designer/src/com/fr/design/cell/bar/DynamicScrollButton.java

@ -149,7 +149,7 @@ public class DynamicScrollButton extends BasicArrowButton {
// g2.fillRoundRect(1, 1, 16, 7, 3, 3); // g2.fillRoundRect(1, 1, 16, 7, 3, 3);
// g2.setColor(a); // g2.setColor(a);
// g2.drawRoundRect(1, 1, 15, 15, 3, 3); // g2.drawRoundRect(1, 1, 15, 15, 3, 3);
// g2.setColor(new Color(240, 240, 240)); // g2.setColor(new Color(212, 212, 216));
// g2.drawRoundRect(2, 2, 13, 13, 3, 3); // g2.drawRoundRect(2, 2, 13, 13, 3, 3);
break; break;
} }

2
designer/src/com/fr/design/cell/bar/ScrollBarUIConstant.java

@ -23,7 +23,7 @@ public class ScrollBarUIConstant {
public static final ColorUIResource SCROLL_ARROW_COLOR = new ColorUIResource(112, 112, 112); public static final ColorUIResource SCROLL_ARROW_COLOR = new ColorUIResource(112, 112, 112);
public static final ColorUIResource PRESSED_LIGHT_COLOR = new ColorUIResource(205, 234, 252); public static final ColorUIResource PRESSED_LIGHT_COLOR = new ColorUIResource(205, 234, 252);
public static final ColorUIResource WHITE_BORDER_COLOR = new ColorUIResource(240, 240, 240); public static final ColorUIResource WHITE_BORDER_COLOR = new ColorUIResource(212, 212, 216);
public static final ColorUIResource NORMAL_SCROLL_BUTTON_COLOR = new ColorUIResource(0xffffff); public static final ColorUIResource NORMAL_SCROLL_BUTTON_COLOR = new ColorUIResource(0xffffff);
public static final ColorUIResource PRESSED_SCROLL_BUTTON_COLOR = new ColorUIResource(0xd2d2d2); public static final ColorUIResource PRESSED_SCROLL_BUTTON_COLOR = new ColorUIResource(0xd2d2d2);

3
designer/src/com/fr/design/parameter/ParameterDefinitePane.java

@ -151,7 +151,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
*/ */
public void setComponentBg(Container cc) { public void setComponentBg(Container cc) {
for (Component com : cc.getComponents()) { for (Component com : cc.getComponents()) {
com.setBackground(new Color(240, 240, 240)); com.setBackground(new Color(212, 212, 216));
if (com instanceof Container) { if (com instanceof Container) {
setComponentBg((Container) com); setComponentBg((Container) com);
} }
@ -250,6 +250,7 @@ public class ParameterDefinitePane extends JPanel implements ToolBarMenuDockPlus
bridge.setPosition(reportParameterAttr.getAlign()); bridge.setPosition(reportParameterAttr.getAlign());
bridge.setDisplay(reportParameterAttr.isShowWindow()); bridge.setDisplay(reportParameterAttr.isShowWindow());
bridge.setBackground(reportParameterAttr.getBackground()); bridge.setBackground(reportParameterAttr.getBackground());
bridge.setUseParamsTemplate(reportParameterAttr.isUseParamsTemplate());
} }
} }

7
designer/src/com/fr/grid/GridHeader.java

@ -1,9 +1,6 @@
package com.fr.grid; package com.fr.grid;
import com.fr.base.ScreenResolution; import java.awt.*;
import java.awt.Color;
public abstract class GridHeader<T> extends BaseGridComponent { public abstract class GridHeader<T> extends BaseGridComponent {
@ -12,7 +9,7 @@ public abstract class GridHeader<T> extends BaseGridComponent {
//属性 //属性
private Color separatorLineColor = new Color(172, 168, 153); //separator lines private Color separatorLineColor = new Color(172, 168, 153); //separator lines
private Color selectedForeground = Color.black; private Color selectedForeground = Color.black;
private Color selectedBackground = new Color(253, 216, 153); private Color selectedBackground = new Color(208, 240, 252);
protected int resolution; protected int resolution;

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

@ -62,7 +62,8 @@ public interface UIConstants {
public static final Color SKY_BLUE = new Color(164, 192, 220); 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 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(240, 240, 240); public static final Color NORMAL_BACKGROUND = new Color(212, 212, 216);
public static final Color TOOLBARUI_BACKGROUND = new Color(255, 255, 255);
public static final Color SHADOW_GREY = new Color(0xe2e2e2); public static final Color SHADOW_GREY = new Color(0xe2e2e2);
public static final Color SHADOW_CENTER = new Color(200, 200, 200); public static final Color SHADOW_CENTER = new Color(200, 200, 200);
public static final Color SHADOW_PURPLE = new Color(255, 0, 255); public static final Color SHADOW_PURPLE = new Color(255, 0, 255);

2
designer_base/src/com/fr/design/gui/UIDefaultTheme.java

@ -87,7 +87,7 @@ public class UIDefaultTheme extends DefaultMetalTheme {
table.put("TabbedPane.tabAreaInsets", new InsetsUIResource(4, 2, 0, 0)); table.put("TabbedPane.tabAreaInsets", new InsetsUIResource(4, 2, 0, 0));
table.put("TabbedPane.tabInsets", new InsetsUIResource(1, 6, 4, 6)); table.put("TabbedPane.tabInsets", new InsetsUIResource(1, 6, 4, 6));
table.put("Table.gridColor", ThemeUtils.TABLE_GRID_COLOR); table.put("Table.gridColor", ThemeUtils.TABLE_GRID_COLOR);
table.put("MenuBar.background", new ColorUIResource(240, 240, 240)); table.put("MenuBar.background", new ColorUIResource(212, 212, 216));
table.put("Menu.foreground", ThemeUtils.MENU_ITEM_FONT_COLOR); table.put("Menu.foreground", ThemeUtils.MENU_ITEM_FONT_COLOR);
table.put("MenuItem.foreground", ThemeUtils.MENU_ITEM_FONT_COLOR); table.put("MenuItem.foreground", ThemeUtils.MENU_ITEM_FONT_COLOR);
table.put("ToolBar.background", new ColorUIResource(239, 237, 229)); table.put("ToolBar.background", new ColorUIResource(239, 237, 229));

2
designer_base/src/com/fr/design/gui/iscrollbar/UIScrollButton.java

@ -117,7 +117,7 @@ public class UIScrollButton extends BasicArrowButton {
// g2.fillRoundRect(1, 1, 16, 7, 3, 3); // g2.fillRoundRect(1, 1, 16, 7, 3, 3);
// g2.setColor(a); // g2.setColor(a);
// g2.drawRoundRect(1, 1, 15, 15, 3, 3); // g2.drawRoundRect(1, 1, 15, 15, 3, 3);
// g2.setColor(new Color(240, 240, 240)); // g2.setColor(new Color(212, 212, 216));
// g2.drawRoundRect(2, 2, 13, 13, 3, 3); // g2.drawRoundRect(2, 2, 13, 13, 3, 3);
break; break;
} }

2
designer_base/src/com/fr/design/gui/itoolbar/UIToolBarUI.java

@ -89,7 +89,7 @@ public class UIToolBarUI extends MetalToolBarUI {
*/ */
public void paint(Graphics g, JComponent c) { public void paint(Graphics g, JComponent c) {
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
g2.setColor(UIConstants.NORMAL_BACKGROUND); g2.setColor(UIConstants.TOOLBARUI_BACKGROUND);
g2.fillRect(0, 0, c.getWidth(), c.getHeight()); g2.fillRect(0, 0, c.getWidth(), c.getHeight());
} }

2
designer_base/src/com/fr/design/gui/itoolbar/UIToolbar.java

@ -17,6 +17,8 @@ public class UIToolbar extends JToolBar{
setRollover(true); setRollover(true);
setLayout(new FlowLayout(align, 4, 0)); setLayout(new FlowLayout(align, 4, 0));
setUI(new UIToolBarUI()); setUI(new UIToolBarUI());
setBorderPainted(false);
setBackground(Color.RED);
} }
@Override @Override

8
designer_base/src/com/fr/design/gui/itooltip/UIToolTipUI.java

@ -34,13 +34,13 @@ public class UIToolTipUI extends ToolTipUI {
int height = size.height; int height = size.height;
Graphics2D g2 = (Graphics2D) g; Graphics2D g2 = (Graphics2D) g;
g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON); g2.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
GradientPaint paint = new GradientPaint(0, 0, new Color(240, 240, 240), 0, height ,new Color(171, 183, 203)); GradientPaint paint = new GradientPaint(0, 0, new Color(212, 212, 216), 0, height ,new Color(171, 183, 203));
g2.setPaint(paint); g2.setPaint(paint);
g2.fillRoundRect(0, 0, width - 3, height - 3, 6, 6); g2.fillRoundRect(0, 0, width - 3, height - 3, 6, 6);
g2.setColor(new Color(100, 100, 100)); g2.setColor(new Color(100, 100, 100));
g2.drawRoundRect(0, 0, width - 3, height - 3, 6, 6); g2.drawRoundRect(0, 0, width - 3, height - 3, 6, 6);
GradientPaint cornerPaint = new GradientPaint(width-3, height-3, new Color(100, 100, 100, 191), width - 1, height - 1, new Color(240, 240, 240)); GradientPaint cornerPaint = new GradientPaint(width-3, height-3, new Color(100, 100, 100, 191), width - 1, height - 1, new Color(212, 212, 216));
g2.setPaint(cornerPaint); g2.setPaint(cornerPaint);
g2.fillArc(width - 6, height - 6, 6, 6, 270, 90 ); g2.fillArc(width - 6, height - 6, 6, 6, 270, 90 );
@ -49,7 +49,7 @@ public class UIToolTipUI extends ToolTipUI {
shadowDown.lineTo(3, height); shadowDown.lineTo(3, height);
shadowDown.lineTo(width - 3, height); shadowDown.lineTo(width - 3, height);
shadowDown.lineTo(width - 3, height - 3); shadowDown.lineTo(width - 3, height - 3);
GradientPaint downPaint = new GradientPaint(0, height-3, new Color(100, 100, 100, 191), 0, height, new Color(240, 240, 240)); GradientPaint downPaint = new GradientPaint(0, height-3, new Color(100, 100, 100, 191), 0, height, new Color(212, 212, 216));
g2.setPaint(downPaint); g2.setPaint(downPaint);
GraphHelper.fill(g2, shadowDown); GraphHelper.fill(g2, shadowDown);
@ -58,7 +58,7 @@ public class UIToolTipUI extends ToolTipUI {
shadowRight.lineTo(width, height - 3); shadowRight.lineTo(width, height - 3);
shadowRight.lineTo(width, 3); shadowRight.lineTo(width, 3);
shadowRight.lineTo(width - 3, 0); shadowRight.lineTo(width - 3, 0);
GradientPaint rightPaint = new GradientPaint(width - 3, 0, new Color(100, 100, 100, 191), width, 0, new Color(240, 240, 240)); GradientPaint rightPaint = new GradientPaint(width - 3, 0, new Color(100, 100, 100, 191), width, 0, new Color(212, 212, 216));
g2.setPaint(rightPaint); g2.setPaint(rightPaint);
GraphHelper.fill(g2, shadowRight); GraphHelper.fill(g2, shadowRight);

8
designer_base/src/com/fr/design/utils/ThemeUtils.java

@ -15,7 +15,7 @@ public class ThemeUtils {
public static final ColorUIResource NORMAL_FOREGROUND = new ColorUIResource(0, 0, 0); public static final ColorUIResource NORMAL_FOREGROUND = new ColorUIResource(0, 0, 0);
public static final ColorUIResource TEXT_SELECTED_BG_COLOR = new ColorUIResource(43, 107, 197); public static final ColorUIResource TEXT_SELECTED_BG_COLOR = new ColorUIResource(43, 107, 197);
public static final ColorUIResource TEXT_SELECTED_TEXT_COLOR = new ColorUIResource(255, 255, 255); public static final ColorUIResource TEXT_SELECTED_TEXT_COLOR = new ColorUIResource(255, 255, 255);
public static final ColorUIResource NORMAL_BG = new ColorUIResource(242, 240, 238); public static final ColorUIResource NORMAL_BG = new ColorUIResource(212, 212, 216);
public static final ColorUIResource DISABLE_TEXT = new ColorUIResource(143, 142, 139); public static final ColorUIResource DISABLE_TEXT = new ColorUIResource(143, 142, 139);
public static final ColorUIResource TEXT_DISABLED_BG_COLOR = new ColorUIResource(244, 243, 233); public static final ColorUIResource TEXT_DISABLED_BG_COLOR = new ColorUIResource(244, 243, 233);
public static final ColorUIResource TEXT_BG_COLOR = new ColorUIResource(255, 255, 255); public static final ColorUIResource TEXT_BG_COLOR = new ColorUIResource(255, 255, 255);
@ -49,7 +49,7 @@ public class ThemeUtils {
public static final int BUTTON_SPREAD_LIGHT_DISABLE = 20; public static final int BUTTON_SPREAD_LIGHT_DISABLE = 20;
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(240, 240, 240); public static final ColorUIResource BACK_COLOR = new ColorUIResource(212, 212, 216);
public static final ColorUIResource TOOL_SEP_DARK_COLOR = new ColorUIResource(167, 167, 163); public static final ColorUIResource TOOL_SEP_DARK_COLOR = new ColorUIResource(167, 167, 163);
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);
@ -77,7 +77,7 @@ public class ThemeUtils {
public static final ColorUIResource ROLLOVER_DARK_COLOR = new ColorUIResource(165, 217, 249); public static final ColorUIResource ROLLOVER_DARK_COLOR = new ColorUIResource(165, 217, 249);
public static final ColorUIResource NORMAL_LIGHT_COLOR = new ColorUIResource(236, 236, 236); public static final ColorUIResource NORMAL_LIGHT_COLOR = new ColorUIResource(236, 236, 236);
public static final ColorUIResource NORMAL_DARK_COLOR = new ColorUIResource(210, 210, 210); public static final ColorUIResource NORMAL_DARK_COLOR = new ColorUIResource(210, 210, 210);
public static final ColorUIResource WHITE_BORDER_COLOR = new ColorUIResource(240, 240, 240); public static final ColorUIResource WHITE_BORDER_COLOR = new ColorUIResource(212, 212, 216);
public static final ColorUIResource SCROLL_BORDER_COLOR = new ColorUIResource(198, 198, 198); public static final ColorUIResource SCROLL_BORDER_COLOR = new ColorUIResource(198, 198, 198);
public static final ColorUIResource BORDER_COLOR = new ColorUIResource(148, 148, 148); public static final ColorUIResource BORDER_COLOR = new ColorUIResource(148, 148, 148);
public static final boolean SCROLL_ROLLOVER = true; public static final boolean SCROLL_ROLLOVER = true;
@ -139,7 +139,7 @@ public class ThemeUtils {
public static final ColorUIResource MENU_SELECTED_TEXT_COLOR = new ColorUIResource(0, 0, 0); public static final ColorUIResource MENU_SELECTED_TEXT_COLOR = new ColorUIResource(0, 0, 0);
public static final ColorUIResource MENU_ICON_SHADOW_COLOR = new ColorUIResource(236, 233, 216); public static final ColorUIResource MENU_ICON_SHADOW_COLOR = new ColorUIResource(236, 233, 216);
public static final ColorUIResource MENU_ICON_DISABLED_COLOR = new ColorUIResource(165, 163, 151); public static final ColorUIResource MENU_ICON_DISABLED_COLOR = new ColorUIResource(165, 163, 151);
public static final ColorUIResource MENU_BAR_COLOR = new ColorUIResource(240, 240, 240); public static final ColorUIResource MENU_BAR_COLOR = new ColorUIResource(212, 212, 216);
public static final ColorUIResource MENU_POPUP_COLOR = new ColorUIResource(255, 255, 255); public static final ColorUIResource MENU_POPUP_COLOR = new ColorUIResource(255, 255, 255);
public static final ColorUIResource MENU_BORDER_COLOR = new ColorUIResource(173, 170, 153); public static final ColorUIResource MENU_BORDER_COLOR = new ColorUIResource(173, 170, 153);
public static final boolean MENU_ROLLOVER = true; public static final boolean MENU_ROLLOVER = true;

2
designer_chart/src/com/fr/design/mainframe/chart/gui/style/ChartAccColorPane.java

@ -72,7 +72,7 @@ public class ChartAccColorPane extends BasicPane implements MouseListener, UIObs
return; return;
} }
Paint oldPaint = g2d.getPaint(); Paint oldPaint = g2d.getPaint();
g2d.setPaint(new Color(240, 240, 240)); g2d.setPaint(new Color(212, 212, 216));
g2d.fillRect(0, 0, (int)bounds.getWidth(), (int)bounds.getHeight()); g2d.fillRect(0, 0, (int)bounds.getWidth(), (int)bounds.getHeight());
g2d.setPaint(oldPaint); g2d.setPaint(oldPaint);

Loading…
Cancel
Save