diff --git a/designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java b/designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java index 66e2d97cf..9fdf217da 100644 --- a/designer/src/com/fr/design/actions/cell/style/ReportFontItalicAction.java +++ b/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); } diff --git a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java b/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java index 0a5351048..b47975b3f 100644 --- a/designer_base/src/com/fr/design/gui/ibutton/UIToggleButton.java +++ b/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()); } diff --git a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java b/designer_base/src/com/fr/design/gui/style/AlignmentPane.java index f0e760cfd..9939ab2e1 100644 --- a/designer_base/src/com/fr/design/gui/style/AlignmentPane.java +++ b/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(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(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")}); diff --git a/designer_base/src/com/fr/design/gui/style/BorderPane.java b/designer_base/src/com/fr/design/gui/style/BorderPane.java index a78c4fd7e..e05d7f529 100644 --- a/designer_base/src/com/fr/design/gui/style/BorderPane.java +++ b/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); } diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/bottom_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/bottom_white.png new file mode 100644 index 000000000..a87cd273a Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/bottom_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png new file mode 100644 index 000000000..b350c5727 Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/defaultAlignment_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png new file mode 100644 index 000000000..e776e2efc Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/h_s_normal_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/horizontal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/horizontal_white.png new file mode 100644 index 000000000..2be4ab895 Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/horizontal_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/in_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/in_white.png new file mode 100644 index 000000000..6936456ad Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/in_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png index 6b36a5c1a..5e48d7633 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic_white.png index 936a3e784..e32c6eaef 100644 Binary files a/designer_base/src/com/fr/design/images/m_format/cellstyle/italic_white.png and b/designer_base/src/com/fr/design/images/m_format/cellstyle/italic_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/left_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/left_white.png new file mode 100644 index 000000000..ed850955f Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/left_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/out_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/out_white.png new file mode 100644 index 000000000..92ab6e35e Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/out_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/right_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/right_white.png new file mode 100644 index 000000000..323312126 Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/right_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/top_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/top_white.png new file mode 100644 index 000000000..7bf97dcf1 Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/top_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png new file mode 100644 index 000000000..821626f6b Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_center_normal_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png new file mode 100644 index 000000000..d86816f87 Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_down_normal_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png new file mode 100644 index 000000000..2ea2412ea Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/v_top_normal_white.png differ diff --git a/designer_base/src/com/fr/design/images/m_format/cellstyle/vertical_white.png b/designer_base/src/com/fr/design/images/m_format/cellstyle/vertical_white.png new file mode 100644 index 000000000..2ae8d0f69 Binary files /dev/null and b/designer_base/src/com/fr/design/images/m_format/cellstyle/vertical_white.png differ