Browse Source

REPORT-4888 设计器交互修改

1.单元格属性-样式-单元格 图标反白
2.单元格属性-样式-对齐 图标反白
3.工具栏倾斜按钮图标替换
master
MoMeak 7 years ago
parent
commit
814cf80da4
  1. 2
      designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java
  2. 12
      designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java
  3. 14
      designer_base/src/com/fr/design/gui/style/AlignmentPane.java
  4. 16
      designer_base/src/com/fr/design/gui/style/BorderPane.java
  5. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/bottom_white.png
  6. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png
  7. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png
  8. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/horizontal_white.png
  9. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/in_white.png
  10. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png
  11. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/left_white.png
  12. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/out_white.png
  13. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/right_white.png
  14. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/top_white.png
  15. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png
  16. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png
  17. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png
  18. BIN
      designer_base/src/com/fr/design/images/m_format/cellstyle/vertical_white.png

2
designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java

@ -22,7 +22,7 @@ public class ReportFontItalicAction extends ReportFontBoldAction {
public ReportFontItalicAction(ElementCasePane t) {
super(t);
this.setName(Inter.getLocText("FRFont-italic"));
this.setName(Inter.getLocText("FR-Designer-FRFont_Italic"));
this.setSmallIcon(ICONS, true);
}

12
designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java

@ -76,6 +76,18 @@ public class UIToggleButton extends UIButton implements GlobalNameObserver{
super(icons[0], null, icons[1]);
setSelectedIcon(icons[1]);
setExtraPainted(true);
if (!needRelease) {
addActionListener(new AbstractAction() {
@Override
public void actionPerformed(ActionEvent e) {
if (UIToggleButton.super.isSelected()) {
UIToggleButton.super.setSelected(false);
} else {
UIToggleButton.super.setSelected(true);
}
}
});
}
addMouseListener(getMouseListener());
}

14
designer_base/src/com/fr/design/gui/style/AlignmentPane.java

@ -83,12 +83,8 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
Icon[][] hAlignmentIconArray = {{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal_white.png")},
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal_white.png")},
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png")},
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png")},
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")}};
// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_center_normal.png"),
// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal.png"),
// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"),
// BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png")};
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png")},
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png")}};
Integer[] hAlignment = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT, Integer.valueOf(Constants.DISTRIBUTED), Constants.NULL};
hAlignmentPane = new UIButtonGroup<Integer>(hAlignmentIconArray, hAlignment);
hAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Left"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Right"),
@ -96,9 +92,9 @@ public class AlignmentPane extends AbstractBasicStylePane implements GlobalNameO
hPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
vPaneContainer = new JPanel(new FlowLayout(FlowLayout.LEFT, 0, 0));
Icon[] vAlignmentIconArray = {BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"),
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"),
BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png")};
Icon[][] vAlignmentIconArray = {{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png")},
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png")},
{BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png")}};
Integer[] vAlignment = new Integer[]{Constants.TOP, Constants.CENTER, Constants.BOTTOM};
vAlignmentPane = new UIButtonGroup<Integer>(vAlignmentIconArray, vAlignment);
vAlignmentPane.setAllToolTips(new String[]{Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Top"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Center"), Inter.getLocText("FR-Designer-StyleAlignment_Tooltips_Bottom")});

16
designer_base/src/com/fr/design/gui/style/BorderPane.java

@ -82,10 +82,10 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
new Component[]{null, null},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_Color") + " ", SwingConstants.LEFT), currentLineColorPane},
new Component[]{null, null},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + " ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/out.png"))},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_outBorder") + " ", SwingConstants.LEFT), outerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/out.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/out_white.png")}, false)},
new Component[]{null, externalPane},
new Component[]{null, null},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + " ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(BaseUtils.readIcon("com/fr/design/images/m_format/in.png"))},
new Component[]{new UILabel(Inter.getLocText("FR-Designer_inBorder") + " ", SwingConstants.LEFT), innerToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("com/fr/design/images/m_format/in.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/in_white.png")}, false)},
new Component[]{null, insidePane},
new Component[]{null, null}
};
@ -125,12 +125,12 @@ public class BorderPane extends AbstractBasicStylePane implements GlobalNameObse
};
private void initButtonsWithIcon() {
topToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"));
leftToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"));
bottomToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"));
rightToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"));
horizontalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"));
verticalToggleButton = new UIToggleButton(BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"));
topToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/top.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/top_white.png")}, false);
leftToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/left.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/left_white.png")}, false);
bottomToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/bottom.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bottom_white.png")}, false);
rightToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/right.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/right_white.png")}, false);
horizontalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/horizontal.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/horizontal_white.png")}, false);
verticalToggleButton = new UIToggleButton(new Icon[]{BaseUtils.readIcon("/com/fr/base/images/dialog/border/vertical.png"), BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/vertical_white.png")}, false);
this.currentLineCombo = new LineComboBox(CoreConstants.UNDERLINE_STYLE_ARRAY);
this.currentLineColorPane = new NewColorSelectBox(100);
}

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 178 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 124 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 112 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 187 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 167 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: 206 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 175 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 172 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 181 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 121 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 119 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 123 B

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 186 B

Loading…
Cancel
Save