Browse Source

remove unused img

master
hzzz 7 years ago
parent
commit
a9f610badb
  1. 26
      designer/src/com/fr/design/actions/cell/style/StyleBackgroundAction.java
  2. 2
      designer/src/com/fr/design/mainframe/alphafine/component/AlphaFinePane.java
  3. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine1.png
  4. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine2.png
  5. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine3.png
  6. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine4.png
  7. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/alphafine5.png
  8. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected1.png
  9. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected2.png
  10. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected3.png
  11. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected4.png
  12. BIN
      designer/src/com/fr/design/mainframe/alphafine/images/selected5.png
  13. 2
      designer/src/com/fr/poly/PolyComponetsBar.java
  14. 1
      designer/src/com/fr/poly/PolyDesigner.java
  15. 14
      designer/src/com/fr/start/Designer.java
  16. 3
      designer_base/src/com/fr/design/constants/UIConstants.java
  17. 2
      designer_base/src/com/fr/design/file/NewTemplatePane.java
  18. 2
      designer_base/src/com/fr/design/gui/UIDefaultTheme.java
  19. BIN
      designer_base/src/com/fr/design/gui/autocomplete/arrow_left.png
  20. BIN
      designer_base/src/com/fr/design/gui/autocomplete/arrow_right.png
  21. BIN
      designer_base/src/com/fr/design/gui/autocomplete/bullet_black.png
  22. BIN
      designer_base/src/com/fr/design/gui/autocomplete/osx_sizegrip.png
  23. 22
      designer_base/src/com/fr/design/gui/itree/filetree/EnvFileTree.java
  24. 2
      designer_base/src/com/fr/design/gui/itree/refreshabletree/RefreshableJTree.java
  25. BIN
      designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png
  26. BIN
      designer_base/src/com/fr/design/images/browser/360.png
  27. BIN
      designer_base/src/com/fr/design/images/browser/firefox.png
  28. BIN
      designer_base/src/com/fr/design/images/browser/ie.png
  29. BIN
      designer_base/src/com/fr/design/images/buttonicon/Artboard 2.png
  30. BIN
      designer_base/src/com/fr/design/images/buttonicon/add_over.png
  31. BIN
      designer_base/src/com/fr/design/images/buttonicon/arrow.png
  32. BIN
      designer_base/src/com/fr/design/images/buttonicon/arrowdown.png
  33. BIN
      designer_base/src/com/fr/design/images/buttonicon/arrowup.png
  34. BIN
      designer_base/src/com/fr/design/images/buttonicon/button_0.png
  35. BIN
      designer_base/src/com/fr/design/images/buttonicon/dscolumn.png
  36. BIN
      designer_base/src/com/fr/design/images/buttonicon/list_cover.png
  37. BIN
      designer_base/src/com/fr/design/images/buttonicon/list_covered.png
  38. BIN
      designer_base/src/com/fr/design/images/buttonicon/list_icon.png
  39. BIN
      designer_base/src/com/fr/design/images/buttonicon/list_press.png
  40. BIN
      designer_base/src/com/fr/design/images/buttonicon/list_pressed.png
  41. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png
  42. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png
  43. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png
  44. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png
  45. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png
  46. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png
  47. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png
  48. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png
  49. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png
  50. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png
  51. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png
  52. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png
  53. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png
  54. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png
  55. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png
  56. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png
  57. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png
  58. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png
  59. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png
  60. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png
  61. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png
  62. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png
  63. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png
  64. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png
  65. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png
  66. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png
  67. BIN
      designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png
  68. BIN
      designer_base/src/com/fr/design/images/buttonicon/type_string的副本.png
  69. BIN
      designer_base/src/com/fr/design/images/chart/ConditionAttr.png
  70. BIN
      designer_base/src/com/fr/design/images/chart/moved.png
  71. BIN
      designer_base/src/com/fr/design/images/control/addPopup.png
  72. BIN
      designer_base/src/com/fr/design/images/control/arrow_down.png
  73. BIN
      designer_base/src/com/fr/design/images/control/close_rollover.png
  74. BIN
      designer_base/src/com/fr/design/images/control/closet.png
  75. BIN
      designer_base/src/com/fr/design/images/control/downdis.png
  76. BIN
      designer_base/src/com/fr/design/images/control/edit.png
  77. BIN
      designer_base/src/com/fr/design/images/control/left.png
  78. BIN
      designer_base/src/com/fr/design/images/control/leftleft.png
  79. BIN
      designer_base/src/com/fr/design/images/control/refresh.png
  80. BIN
      designer_base/src/com/fr/design/images/control/right.png
  81. BIN
      designer_base/src/com/fr/design/images/control/rightright.png
  82. BIN
      designer_base/src/com/fr/design/images/control/tab/end.png
  83. BIN
      designer_base/src/com/fr/design/images/control/tab/end_not.png
  84. BIN
      designer_base/src/com/fr/design/images/control/tab/first.png
  85. BIN
      designer_base/src/com/fr/design/images/control/tab/first_not.png
  86. BIN
      designer_base/src/com/fr/design/images/control/tab/next.png
  87. BIN
      designer_base/src/com/fr/design/images/control/tab/next_not.png
  88. BIN
      designer_base/src/com/fr/design/images/control/tab/prev.png
  89. BIN
      designer_base/src/com/fr/design/images/control/tab/prev_not.png
  90. BIN
      designer_base/src/com/fr/design/images/control/up.png
  91. BIN
      designer_base/src/com/fr/design/images/control/updis.png
  92. BIN
      designer_base/src/com/fr/design/images/control/warn.png
  93. BIN
      designer_base/src/com/fr/design/images/custombtn/preview_click.png
  94. BIN
      designer_base/src/com/fr/design/images/custombtn/preview_hover.png
  95. BIN
      designer_base/src/com/fr/design/images/dashboard/files.png
  96. BIN
      designer_base/src/com/fr/design/images/data/bind/groupAscColumn.png
  97. BIN
      designer_base/src/com/fr/design/images/data/bind/groupColumn.png
  98. BIN
      designer_base/src/com/fr/design/images/data/bind/groupDescColumn.png
  99. BIN
      designer_base/src/com/fr/design/images/data/bind/summaryColumn.png
  100. BIN
      designer_base/src/com/fr/design/images/data/comb_widget.png
  101. Some files were not shown because too many files have changed in this diff Show More

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

@ -51,21 +51,21 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
} }
@Override @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 //peter:产生tooltip
tbButton.setToolTipText(ActionFactory.createButtonToolTipText(this)); tbButton.setToolTipText(ActionFactory.createButtonToolTipText(this));

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

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 418 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 372 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine4.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 369 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/alphafine5.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 237 B

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected1.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected3.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected4.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

BIN
designer/src/com/fr/design/mainframe/alphafine/images/selected5.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

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

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

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.VRuler, new VerticalRuler(this));
ployareaPane.add(PolyDesignerLayout.HRuler, new HorizontalRuler(this)); ployareaPane.add(PolyDesignerLayout.HRuler, new HorizontalRuler(this));
ployareaPane.setBackground(Color.white);
this.add(ployareaPane, BorderLayout.CENTER); this.add(ployareaPane, BorderLayout.CENTER);
this.add(polyComponetsBar, BorderLayout.WEST); this.add(polyComponetsBar, BorderLayout.WEST);
this.addKeyListener(showValSpinnerKeyListener); this.addKeyListener(showValSpinnerKeyListener);

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

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

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

2
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(); }

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

@ -48,7 +48,7 @@ public class UIDefaultTheme extends DefaultMetalTheme {
putTreeAndList(table); putTreeAndList(table);
putOthers(table); putOthers(table);
table.put("Desktop.background", new ColorUIResource(212, 210, 194)); 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("Separator.foreground", new ColorUIResource(236, 233, 216));
table.put("TitledBorder.border", new LineBorder( table.put("TitledBorder.border", new LineBorder(
new ColorUIResource(165, 163, 151))); new ColorUIResource(165, 163, 151)));

BIN
designer_base/src/com/fr/design/gui/autocomplete/arrow_left.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

BIN
designer_base/src/com/fr/design/gui/autocomplete/arrow_right.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 349 B

BIN
designer_base/src/com/fr/design/gui/autocomplete/bullet_black.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 221 B

BIN
designer_base/src/com/fr/design/gui/autocomplete/osx_sizegrip.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

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

@ -106,7 +106,7 @@ public class EnvFileTree extends RefreshableJTree {
Dimension dim = label.getPreferredSize(); Dimension dim = label.getPreferredSize();
dim.height += 2; dim.height += 2;
this.setPreferredSize(dim); this.setPreferredSize(dim);
this.setBackgroundNonSelectionColor(UIConstants.NORMAL_BACKGROUND); this.setBackgroundNonSelectionColor(UIConstants.TREE_BACKGROUND);
this.setForeground(UIConstants.FONT_COLOR); this.setForeground(UIConstants.FONT_COLOR);
this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE); this.setBackgroundSelectionColor(UIConstants.FLESH_BLUE);
return this; return this;
@ -327,18 +327,18 @@ public class EnvFileTree extends RefreshableJTree {
/* /*
* 把FileNode[]转成ExpandMutableTreeNode[] * 把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;
} }
/* /*
* 是否是父子关系的文件. * 是否是父子关系的文件.

2
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(); ExpandMutableTreeNode root = (ExpandMutableTreeNode) model.getRoot();
root.setExpanded(true); root.setExpanded(true);
this.setRootVisible(false); this.setRootVisible(false);
this.setBackground(UIConstants.NORMAL_BACKGROUND); this.setBackground(UIConstants.TREE_BACKGROUND);
this.addTreeExpansionListener(expansion); this.addTreeExpansionListener(expansion);
this.addTreeWillExpandListener(willExpand); this.addTreeWillExpandListener(willExpand);
} }

BIN
designer_base/src/com/fr/design/gui/syntax/ui/rsyntaxtextarea/focusabletip/osx_sizegrip.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.8 KiB

BIN
designer_base/src/com/fr/design/images/browser/360.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
designer_base/src/com/fr/design/images/browser/firefox.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
designer_base/src/com/fr/design/images/browser/ie.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

BIN
designer_base/src/com/fr/design/images/buttonicon/Artboard 2.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

BIN
designer_base/src/com/fr/design/images/buttonicon/add_over.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

BIN
designer_base/src/com/fr/design/images/buttonicon/arrow.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 B

BIN
designer_base/src/com/fr/design/images/buttonicon/arrowdown.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 191 B

BIN
designer_base/src/com/fr/design/images/buttonicon/arrowup.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 200 B

BIN
designer_base/src/com/fr/design/images/buttonicon/button_0.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 623 B

BIN
designer_base/src/com/fr/design/images/buttonicon/dscolumn.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

BIN
designer_base/src/com/fr/design/images/buttonicon/list_cover.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

BIN
designer_base/src/com/fr/design/images/buttonicon/list_covered.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

BIN
designer_base/src/com/fr/design/images/buttonicon/list_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
designer_base/src/com/fr/design/images/buttonicon/list_press.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

BIN
designer_base/src/com/fr/design/images/buttonicon/list_pressed.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 667 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 624 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/authorityedit_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 639 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 380 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 363 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellattr_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 373 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 156 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 344 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 352 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/conditionattr_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 361 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 574 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 542 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/configuredroles_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 559 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 135 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/floatelement_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 143 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 708 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 740 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/hyperlink_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 729 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_disabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 619 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 614 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetlib_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 628 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_diabled.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 394 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_normal.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 393 B

BIN
designer_base/src/com/fr/design/images/buttonicon/propertiestab/widgetsettings_selected.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 408 B

BIN
designer_base/src/com/fr/design/images/buttonicon/type_string的副本.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 460 B

BIN
designer_base/src/com/fr/design/images/chart/ConditionAttr.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 458 B

BIN
designer_base/src/com/fr/design/images/chart/moved.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

BIN
designer_base/src/com/fr/design/images/control/addPopup.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 B

After

Width:  |  Height:  |  Size: 210 B

BIN
designer_base/src/com/fr/design/images/control/arrow_down.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 B

BIN
designer_base/src/com/fr/design/images/control/close_rollover.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
designer_base/src/com/fr/design/images/control/closet.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.0 KiB

BIN
designer_base/src/com/fr/design/images/control/downdis.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
designer_base/src/com/fr/design/images/control/edit.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 303 B

After

Width:  |  Height:  |  Size: 388 B

BIN
designer_base/src/com/fr/design/images/control/left.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 694 B

After

Width:  |  Height:  |  Size: 300 B

BIN
designer_base/src/com/fr/design/images/control/leftleft.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 326 B

BIN
designer_base/src/com/fr/design/images/control/refresh.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

After

Width:  |  Height:  |  Size: 533 B

BIN
designer_base/src/com/fr/design/images/control/right.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 706 B

After

Width:  |  Height:  |  Size: 285 B

BIN
designer_base/src/com/fr/design/images/control/rightright.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 384 B

BIN
designer_base/src/com/fr/design/images/control/tab/end.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 248 B

After

Width:  |  Height:  |  Size: 208 B

BIN
designer_base/src/com/fr/design/images/control/tab/end_not.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 250 B

BIN
designer_base/src/com/fr/design/images/control/tab/first.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

After

Width:  |  Height:  |  Size: 201 B

BIN
designer_base/src/com/fr/design/images/control/tab/first_not.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 264 B

BIN
designer_base/src/com/fr/design/images/control/tab/next.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 265 B

After

Width:  |  Height:  |  Size: 193 B

BIN
designer_base/src/com/fr/design/images/control/tab/next_not.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 257 B

BIN
designer_base/src/com/fr/design/images/control/tab/prev.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 272 B

After

Width:  |  Height:  |  Size: 182 B

BIN
designer_base/src/com/fr/design/images/control/tab/prev_not.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

BIN
designer_base/src/com/fr/design/images/control/up.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 216 B

After

Width:  |  Height:  |  Size: 255 B

BIN
designer_base/src/com/fr/design/images/control/updis.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
designer_base/src/com/fr/design/images/control/warn.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

BIN
designer_base/src/com/fr/design/images/custombtn/preview_click.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
designer_base/src/com/fr/design/images/custombtn/preview_hover.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

BIN
designer_base/src/com/fr/design/images/dashboard/files.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 213 B

BIN
designer_base/src/com/fr/design/images/data/bind/groupAscColumn.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 316 B

BIN
designer_base/src/com/fr/design/images/data/bind/groupColumn.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

BIN
designer_base/src/com/fr/design/images/data/bind/groupDescColumn.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 318 B

BIN
designer_base/src/com/fr/design/images/data/bind/summaryColumn.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 291 B

BIN
designer_base/src/com/fr/design/images/data/comb_widget.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 492 B

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save