remove unused img

designer/src/com/fr/design/actions/cell/style/StyleBackgroundAction.java

@@ -51,21 +51,21 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
     }
     
 	@Override
-	public boolean isFontStye() {
+        public boolean isFontStye() {
-		return false;
+            return false;
-	}
+        }
 
-    @Override
+        @Override
-	public JComponent createToolBarComponent() {
+        public JComponent createToolBarComponent() {
-        Object object = this.getValue(UIToolbarColorButton.class.getName());
+            Object object = this.getValue(UIToolbarColorButton.class.getName());
-        if (object == null || !(object instanceof UIToolbarColorButton)) {
+            if (object == null || !(object instanceof UIToolbarColorButton)) {
-            UIToolbarColorButton tbButton = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
+                UIToolbarColorButton tbButton = new UIToolbarColorButton(BaseUtils.readIcon("/com/fr/design/images/gui/color/background.png"));
-			tbButton.set4Toolbar();
+                tbButton.set4Toolbar();
-            this.putValue(UIToolbarColorButton.class.getName(), tbButton);
+                this.putValue(UIToolbarColorButton.class.getName(), tbButton);
 
-            tbButton.setEnabled(this.isEnabled());
+                tbButton.setEnabled(this.isEnabled());
-            tbButton.setColor(Color.WHITE);
+                tbButton.setColor(Color.WHITE);
-            tbButton.addColorChangeListener(this);
+                tbButton.addColorChangeListener(this);
 
             //peter:产生tooltip
             tbButton.setToolTipText(ActionFactory.createButtonToolTipText(this));

designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java

@@ -6,6 +6,7 @@ import com.fr.design.actions.help.alphafine.AlphaFineListener;
 import com.fr.design.dialog.BasicPane;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.mainframe.alphafine.AlphaFineHelper;
+import com.fr.design.utils.ThemeUtils;
 import com.fr.general.IOUtils;
 import com.fr.general.Inter;
 
@@ -30,6 +31,7 @@ public class AlphaFinePane extends BasicPane {
         refreshButton.setToolTipText(Inter.getLocText("FR-Designer_AlphaFine"));
         refreshButton.set4ToolbarButton();
         this.add(refreshButton);
+        this.setBackground(ThemeUtils.WHITE_BORDER_COLOR);
         refreshButton.addActionListener(new ActionListener() {
             @Override
             public void actionPerformed(ActionEvent e) {

designer/src/com/fr/poly/PolyComponetsBar.java

@@ -34,7 +34,7 @@ public class PolyComponetsBar extends JToolBar {
 		setOrientation(SwingConstants.VERTICAL);
 		setBorder(BorderFactory.createEmptyBorder(4, 4, 0, 4));
 		setFloatable(false);
-		setBackground(UIConstants.NORMAL_BACKGROUND);
+		setBackground(UIConstants.TOOLBARUI_BACKGROUND);
 		setLayout(FRGUIPaneFactory.create1ColumnGridLayout());
         int typeLen = typeName.length < MAX_BAR_NUM ? typeName.length : MAX_BAR_NUM;
 		serIcons = new SerIcon[typeLen + 1];

designer/src/com/fr/poly/PolyDesigner.java

@@ -152,6 +152,7 @@ public class PolyDesigner extends ReportComponent<PolyWorkSheet, PolyElementCase
 
         ployareaPane.add(PolyDesignerLayout.VRuler, new VerticalRuler(this));
         ployareaPane.add(PolyDesignerLayout.HRuler, new HorizontalRuler(this));
+        ployareaPane.setBackground(Color.white);
         this.add(ployareaPane, BorderLayout.CENTER);
         this.add(polyComponetsBar, BorderLayout.WEST);
         this.addKeyListener(showValSpinnerKeyListener);

designer/src/com/fr/start/Designer.java

@@ -132,23 +132,26 @@ public class Designer extends BaseDesigner {
     public UILargeToolbar createLargeToolbar() {
         UILargeToolbar largeToolbar = super.createLargeToolbar();
         largeToolbar.setLayout(new FlowLayout(FlowLayout.CENTER, 0, 4));
-        largeToolbar.add(new JPanel() {
+        JPanel templeJpanel = new JPanel() {
             public Dimension getPreferredSize() {
                 Dimension dim = super.getPreferredSize();
                 dim.width = 1;
                 return dim;
             }
-        });
+        };
+        templeJpanel.setBackground(Color.white);
+        largeToolbar.add(templeJpanel);
         createRunButton(largeToolbar);
         largeToolbar.add(run);
-        largeToolbar.add(new JPanel() {
+        templeJpanel = new JPanel() {
             public Dimension getPreferredSize() {
                 Dimension dim = super.getPreferredSize();
                 dim.width = GAP;
                 return dim;
             }
-        });
+        };
-        largeToolbar.addSeparator(new Dimension(2, 42));
+        templeJpanel.setBackground(Color.white);
+        largeToolbar.add(templeJpanel);
         largeToolbar.setBorder(new MatteBorder(new Insets(0, 0, 1, 0), UIConstants.LINE_COLOR));
         return largeToolbar;
     }
@@ -260,6 +263,7 @@ public class Designer extends BaseDesigner {
         run.set4Toolbar();
         run.getUpButton().setToolTipText(Inter.getLocText("FR-Designer_Preview"));
         run.getDownButton().setToolTipText(Inter.getLocText("FR-Designer_Dropdown-More-Preview"));
+        run.setBackground(Color.white);
     }
 
     @Override

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 TREE_BACKGROUND = new Color(240, 240, 243);
     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);
@@ -88,7 +89,7 @@ public interface UIConstants {
     public static final Color SHEET_NORMAL = new Color(0xc8c8ca);
     public static final Color SELECTED_BACKGROUND = new Color(0xdeedfe);
     public static final Color SELECTED_BORDER_LINE_COLOR = new Color(0x3384f0);
-    public static final Color DEFAULT_BG_RULER = new Color(0xf7f7f7);
+    public static final Color DEFAULT_BG_RULER = new Color(0xffffff);
     public static final Color RULER_LINE_COLOR = new Color(0xababab);
     public static final Color RULER_SCALE_COLOR = new Color(0x4e504f);
 

designer_base/src/com/fr/design/file/NewTemplatePane.java

@@ -1 +1 @@
-package com.fr.design.file;

import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.mainframe.DesignerContext;

import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.geom.Line2D;

/**
 * Author : daisy
 * Date: 13-8-27
 * Time: 下午6:07
 */
public abstract class NewTemplatePane extends JComponent implements MouseListener, MouseMotionListener {

	private static final Icon GRAY_NEW_CPT = BaseUtils.readIcon("/com/fr/design/images/buttonicon/additicon_grey.png");
	private static final int PRE_GAP = 0;
	private static final int HEIGHT = 26;
	private Graphics2D g2d;
	private Icon newWorkBookIconMode = null;
	private int newIconStartX = PRE_GAP;


	public NewTemplatePane() {
        newWorkBookIconMode = getNew();
		this.setLayout(new BorderLayout(0, 0));
		this.addMouseListener(this);
		this.addMouseMotionListener(this);
		this.setBorder(null);
		this.setForeground(new Color(99, 99, 99));
	}

	public Dimension getPreferredSize() {
		Dimension dim = super.getPreferredSize();
        dim.width = HEIGHT;
		return dim;
	}


	public void paintComponent(Graphics g) {
		super.paintComponent(g);
		g2d = (Graphics2D) g;
		int sheetIconY = (getHeight() - newWorkBookIconMode.getIconHeight()) / 2;
		newWorkBookIconMode.paintIcon(this, g2d, newIconStartX, sheetIconY);
		paintUnderLine(g2d);
	}


	private void paintUnderLine(Graphics2D g2d) {
		//画下面的那条线
		g2d.setPaint(UIConstants.LINE_COLOR);
		g2d.draw(new Line2D.Double((float) 0, (float) (getHeight()-1), getWidth(), (float) (getHeight()-1)));
	}

    /**
     *鼠标点击
     * @param e 事件
     */
	public void mouseClicked(MouseEvent e) {
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
	}

    /**
     *鼠标按下
     * @param e 事件
     */
	public void mousePressed(MouseEvent e) {
		int evtX = e.getX();
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
		if (isOverNewIcon(evtX) && newWorkBookIconMode != GRAY_NEW_CPT) {
			newWorkBookIconMode = getMousePressNew();
			newIconStartX = 0;
			DesignerContext.getDesignerFrame().addAndActivateJTemplate();
		}
		this.repaint();
	}

    /**
     *鼠标松开
     * @param e 事件
     */
	public void mouseReleased(MouseEvent e) {
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
	}

    /**
     *鼠标进入
     * @param e 事件
     */
	public void mouseEntered(MouseEvent e) {
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
	}

    /**
     *鼠标离开
     * @param e 事件
     */
	public void mouseExited(MouseEvent e) {
		newIconStartX = PRE_GAP;
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		} else {
			newWorkBookIconMode = getNew();
		}

		this.repaint();
	}

    /**
     *鼠标拖拽
     * @param e 事件
     */
	public void mouseDragged(MouseEvent e) {
	}

    /**
     *鼠标移动
     * @param e 事件
     */
	public void mouseMoved(MouseEvent e) {
		int evtX = e.getX();
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		} else if (isOverNewIcon(evtX)) {
			newIconStartX = 0;
			newWorkBookIconMode = getMouseOverNew();
		}

		this.repaint();

	}


	private boolean isOverNewIcon(int evtX) {
		return (evtX >= PRE_GAP && evtX <= PRE_GAP + newWorkBookIconMode.getIconWidth());
	}

	public void setButtonGray(boolean isGray) {
		newWorkBookIconMode = isGray ? GRAY_NEW_CPT : getNew();
	}

    public abstract Icon getNew();

    public abstract Icon getMouseOverNew();

    public abstract Icon getMousePressNew();

}
+package com.fr.design.file;

import com.fr.base.BaseUtils;
import com.fr.design.constants.UIConstants;
import com.fr.design.mainframe.DesignerContext;

import javax.swing.*;
import java.awt.*;
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.awt.event.MouseMotionListener;
import java.awt.geom.Line2D;

/**
 * Author : daisy
 * Date: 13-8-27
 * Time: 下午6:07
 */
public abstract class NewTemplatePane extends JComponent implements MouseListener, MouseMotionListener {

	private static final Icon GRAY_NEW_CPT = BaseUtils.readIcon("/com/fr/design/images/buttonicon/additicon_grey.png");
	private static final int PRE_GAP = 0;
	private static final int HEIGHT = 26;
	private Graphics2D g2d;
	private Icon newWorkBookIconMode = null;
	private int newIconStartX = PRE_GAP;


	public NewTemplatePane() {
        newWorkBookIconMode = getNew();
		this.setLayout(new BorderLayout(0, 0));
		this.addMouseListener(this);
		this.addMouseMotionListener(this);
		this.setBorder(null);
		this.setForeground(new Color(99, 99, 99));
	}

	public Dimension getPreferredSize() {
		Dimension dim = super.getPreferredSize();
        dim.width = HEIGHT;
		return dim;
	}


	public void paintComponent(Graphics g) {
		super.paintComponent(g);
		g2d = (Graphics2D) g;
		int sheetIconY = (getHeight() - newWorkBookIconMode.getIconHeight()) / 2;
		newWorkBookIconMode.paintIcon(this, g2d, newIconStartX, sheetIconY);
//		paintUnderLine(g2d);
	}


	private void paintUnderLine(Graphics2D g2d) {
		//画下面的那条线
		g2d.setPaint(UIConstants.LINE_COLOR);
		g2d.draw(new Line2D.Double((float) 0, (float) (getHeight()-1), getWidth(), (float) (getHeight()-1)));
	}

    /**
     *鼠标点击
     * @param e 事件
     */
	public void mouseClicked(MouseEvent e) {
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
	}

    /**
     *鼠标按下
     * @param e 事件
     */
	public void mousePressed(MouseEvent e) {
		int evtX = e.getX();
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
		if (isOverNewIcon(evtX) && newWorkBookIconMode != GRAY_NEW_CPT) {
			newWorkBookIconMode = getMousePressNew();
			newIconStartX = 0;
			DesignerContext.getDesignerFrame().addAndActivateJTemplate();
		}
		this.repaint();
	}

    /**
     *鼠标松开
     * @param e 事件
     */
	public void mouseReleased(MouseEvent e) {
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
	}

    /**
     *鼠标进入
     * @param e 事件
     */
	public void mouseEntered(MouseEvent e) {
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		}
	}

    /**
     *鼠标离开
     * @param e 事件
     */
	public void mouseExited(MouseEvent e) {
		newIconStartX = PRE_GAP;
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		} else {
			newWorkBookIconMode = getNew();
		}

		this.repaint();
	}

    /**
     *鼠标拖拽
     * @param e 事件
     */
	public void mouseDragged(MouseEvent e) {
	}

    /**
     *鼠标移动
     * @param e 事件
     */
	public void mouseMoved(MouseEvent e) {
		int evtX = e.getX();
		if (BaseUtils.isAuthorityEditing()) {
			newWorkBookIconMode = GRAY_NEW_CPT;
		} else if (isOverNewIcon(evtX)) {
			newIconStartX = 0;
			newWorkBookIconMode = getMouseOverNew();
		}

		this.repaint();

	}


	private boolean isOverNewIcon(int evtX) {
		return (evtX >= PRE_GAP && evtX <= PRE_GAP + newWorkBookIconMode.getIconWidth());
	}

	public void setButtonGray(boolean isGray) {
		newWorkBookIconMode = isGray ? GRAY_NEW_CPT : getNew();
	}

    public abstract Icon getNew();

    public abstract Icon getMouseOverNew();

    public abstract Icon getMousePressNew();

}

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

@@ -48,7 +48,7 @@ public class UIDefaultTheme extends DefaultMetalTheme {
         putTreeAndList(table);
         putOthers(table);
         table.put("Desktop.background", new ColorUIResource(212, 210, 194));
-        table.put("Separator.background", new ColorUIResource(173, 170, 153));
+        table.put("Separator.background", new ColorUIResource(232, 232, 233));
         table.put("Separator.foreground", new ColorUIResource(236, 233, 216));
         table.put("TitledBorder.border", new LineBorder(
                 new ColorUIResource(165, 163, 151)));

designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java

@@ -106,7 +106,7 @@ public class EnvFileTree extends RefreshableJTree {
 			Dimension dim = label.getPreferredSize();
 			dim.height += 2;
 			this.setPreferredSize(dim);
-			this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND);
+			this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
 			this.setForeground(UIConstants.FONT_COLOR);
 			this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);
 			return this;
@@ -327,18 +327,18 @@ public class EnvFileTree extends RefreshableJTree {
 	/*
 	 * 把FileNode[]转成ExpandMutableTreeNode[]
 	 */
-	private ExpandMutableTreeNode[] fileNodeArray2TreeNodeArray(FileNode[] fn_array) {
+		private ExpandMutableTreeNode[] fileNodeArray2TreeNodeArray(FileNode[] fn_array) {
-		ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[fn_array.length];
+			ExpandMutableTreeNode[] res = new ExpandMutableTreeNode[fn_array.length];
-		for (int i = 0; i < res.length; i++) {
+			for (int i = 0; i < res.length; i++) {
-			FileNode fn = fn_array[i];
+				FileNode fn = fn_array[i];
-			res[i] = new ExpandMutableTreeNode(fn);
+				res[i] = new ExpandMutableTreeNode(fn);
-			if (fn.isDirectory()) {
+				if (fn.isDirectory()) {
-				res[i].add(new ExpandMutableTreeNode());
+					res[i].add(new ExpandMutableTreeNode());
+				}
 			}
-		}
 
-		return res;
+			return res;
-	}
+		}
 
 	/*
 	 * 是否是父子关系的文件.

designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java

@@ -40,7 +40,7 @@ public abstract class RefreshableJTree extends CheckBoxTree {
         ExpandMutableTreeNode root = (ExpandMutableTreeNode) model.getRoot();
         root.setExpanded(true);
         this.setRootVisible(false);
-        this.setBackground(UIConstants.NORMAL_BACKGROUND);
+        this.setBackground(UIConstants.TREE_BACKGROUND);
         this.addTreeExpansionListener(expansion);
         this.addTreeWillExpandListener(willExpand);
     }