图标白色

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

@@ -1,27 +1,40 @@
 package com.fr.design.actions.cell.style;
 
-import javax.swing.Icon;
-
 import com.fr.base.BaseUtils;
 import com.fr.base.Style;
 import com.fr.base.chart.BaseChartCollection;
-import com.fr.design.constants.UIConstants;
 import com.fr.design.actions.ButtonGroupAction;
 import com.fr.design.actions.utils.ReportActionUtils;
+import com.fr.design.constants.UIConstants;
 import com.fr.design.gui.ibutton.UIButtonGroup;
-import com.fr.general.Inter;
+import com.fr.design.gui.ibutton.UIToggleButton;
 import com.fr.design.mainframe.ElementCasePane;
+import com.fr.general.Inter;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
 import com.fr.report.cell.FloatElement;
 import com.fr.report.elementcase.TemplateElementCase;
+import com.fr.stable.Constants;
+
+import javax.swing.*;
 
 
 public class AlignmentAction extends ButtonGroupAction implements StyleActionInterface {
 
-	public AlignmentAction(ElementCasePane t, Icon[] iconArray,
+    private static final Icon[] normalBlackIcon = new Icon[]{
-						   Integer[] valueArray) {
+            BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.png"),
-		super(t, iconArray, valueArray);
+            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")};
+
+    private static final Icon[] toggleWhiteIcon = new Icon[]{
+            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_white.png"),
+            BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_right_normal_white.png")};
+
+    private static final Integer[] valueArray = new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT};
+
+    public AlignmentAction(ElementCasePane t) {
+        super(t, normalBlackIcon, valueArray);
     }
 
 
@@ -42,7 +55,17 @@ public class AlignmentAction extends ButtonGroupAction implements StyleActionInt
      * @param style style
      */
     public void updateStyle(Style style) {
-		setSelectedIndex(BaseUtils.getAlignment4Horizontal(style));
+        UIButtonGroup<Integer> buttonGroup = createToolBarComponent();
+        int selected = BaseUtils.getAlignment4Horizontal(style);
+        for (int i = 0; i < normalBlackIcon.length; i++) {
+            UIToggleButton button = buttonGroup.getButton(i);
+            Icon currentIcon = button.getIcon();
+            Icon newIcon = selected == valueArray[i] ? toggleWhiteIcon[i] : normalBlackIcon[i];
+            if (newIcon != currentIcon) {
+                button.setIcon(newIcon);
+            }
+        }
+        setSelectedIndex(selected);
     }
 
     /**

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

@@ -8,10 +8,12 @@ import com.fr.base.Style;
 import com.fr.base.core.StyleUtils;
 import com.fr.design.actions.ToggleButtonUpdateAction;
 import com.fr.design.gui.ibutton.UIToggleButton;
-import com.fr.general.FRFont;
-import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.utils.gui.GUICoreUtils;
+import com.fr.general.FRFont;
+import com.fr.general.Inter;
+
+import javax.swing.*;
 
 /**
  * Bold.
@@ -19,12 +21,14 @@ import com.fr.design.utils.gui.GUICoreUtils;
 public class ReportFontBoldAction extends AbstractStyleAction implements ToggleButtonUpdateAction {
     private UIToggleButton button;
     protected Style style;
+    private final static Icon blackIcon = BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png");
+    private final static Icon whiteIcon = BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold_white.png");
 
     public ReportFontBoldAction(ElementCasePane t) {
         super(t);
 
         this.setName(Inter.getLocText("FRFont-bold"));
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/bold.png"));
+        this.setSmallIcon(blackIcon);
     }
 
     /**
@@ -36,18 +40,24 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB
      */
     @Override
     public Style executeStyle(Style style, Style defStyle) {
-		createToolBarComponent().setSelected(!createToolBarComponent().isSelected());
+        button = createToolBarComponent();
-		if (createToolBarComponent().isSelected()) {
+        button.setIcon(getToggleButtonIcon(button.isSelected()));
+        button.setSelected(!button.isSelected());
+        if (button.isSelected()) {
             setSelectedFont(style);
-			createToolBarComponent().setSelected(false);
+            button.setSelected(false);
         } else {
             setUnselectedFont(style);
-			createToolBarComponent().setSelected(true);
+            button.setSelected(true);
         }
 
         return this.style;
     }
 
+    protected Icon getToggleButtonIcon(boolean isSelected) {
+        return isSelected ? blackIcon : whiteIcon;
+    }
+
     protected void setSelectedFont(Style style) {
         this.style = StyleUtils.boldReportFont(style);
     }
@@ -68,7 +78,9 @@ public class ReportFontBoldAction extends AbstractStyleAction implements ToggleB
         if (frFont == null) {
             return;
         }
-		createToolBarComponent().setSelected(isStyle(frFont));
+        button = createToolBarComponent();
+        button.setSelected(isStyle(frFont));
+        button.setIcon(getToggleButtonIcon(!button.isSelected()));
     }
 
     protected boolean isStyle(FRFont frFont) {

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

@@ -10,16 +10,21 @@ import com.fr.general.FRFont;
 import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
 
+import javax.swing.*;
+
 /**
  * Bold.
  */
 public class ReportFontItalicAction extends ReportFontBoldAction {
 
+    private final static Icon blackIcon = BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png");
+    private final static Icon whiteIcon = BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic_white.png");
+
     public ReportFontItalicAction(ElementCasePane t) {
 		super(t);
 
 		this.setName(Inter.getLocText("FRFont-italic"));
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/italic.png"));
+		this.setSmallIcon(blackIcon);
 	}
 
 
@@ -31,6 +36,9 @@ public class ReportFontItalicAction extends ReportFontBoldAction {
         this.style = StyleUtils.unItalicReportFont(style);
     }
 
+    protected Icon getToggleButtonIcon(boolean isSelected) {
+        return isSelected ? blackIcon : whiteIcon;
+    }
 
     protected boolean isStyle(FRFont frFont) {
         return frFont.isItalic();

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

@@ -11,15 +11,21 @@ import com.fr.general.Inter;
 import com.fr.design.mainframe.ElementCasePane;
 import com.fr.stable.Constants;
 
+import javax.swing.*;
+
 /**
  * Bold.
  */
 public class ReportFontUnderlineAction extends ReportFontBoldAction {
+
+    private final static Icon blackIcon = BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.png");
+    private final static Icon whiteIcon = BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline_white.png");
+
     public ReportFontUnderlineAction(ElementCasePane t) {
 		super(t);
 
 		this.setName(Inter.getLocText("FRFont-Underline"));
-		this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/underline.png"));
+		this.setSmallIcon(blackIcon);
 	}
 
     protected void setSelectedFont (Style style) {
@@ -30,6 +36,9 @@ public class ReportFontUnderlineAction extends ReportFontBoldAction {
         this.style = StyleUtils.setReportFontUnderline(style, false);
     }
 
+    protected Icon getToggleButtonIcon(boolean isSelected) {
+        return isSelected ? blackIcon : whiteIcon;
+    }
 
     protected boolean isStyle(FRFont frFont) {
         return frFont.getUnderline() != Constants.LINE_NONE;

designer/src/com/fr/design/mainframe/ElementCasePane.java

@@ -3,34 +3,7 @@
  */
 package com.fr.design.mainframe;
 
-import java.awt.AWTEvent;
+import com.fr.base.*;
-import java.awt.Adjustable;
-import java.awt.Dimension;
-import java.awt.Image;
-import java.awt.Rectangle;
-import java.awt.datatransfer.Clipboard;
-import java.awt.datatransfer.DataFlavor;
-import java.awt.datatransfer.Transferable;
-import java.awt.event.*;
-import java.lang.reflect.Constructor;
-import java.util.Set;
-
-import javax.swing.AbstractAction;
-import javax.swing.ActionMap;
-import javax.swing.Icon;
-import javax.swing.InputMap;
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-import javax.swing.JPopupMenu;
-import javax.swing.JScrollBar;
-import javax.swing.KeyStroke;
-
-import com.fr.base.BaseUtils;
-import com.fr.base.DynamicUnitList;
-import com.fr.base.FRContext;
-import com.fr.base.Formula;
-import com.fr.base.ScreenResolution;
-import com.fr.base.Style;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
 import com.fr.design.ExtraDesignClassManager;
@@ -39,30 +12,8 @@ import com.fr.design.actions.ExitAuthorityEditAction;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.cell.BorderAction;
 import com.fr.design.actions.cell.CleanAuthorityAction;
-import com.fr.design.actions.cell.style.AlignmentAction;
+import com.fr.design.actions.cell.style.*;
-import com.fr.design.actions.cell.style.ReportFontBoldAction;
+import com.fr.design.actions.columnrow.*;
-import com.fr.design.actions.cell.style.ReportFontForegroundAction;
-import com.fr.design.actions.cell.style.ReportFontItalicAction;
-import com.fr.design.actions.cell.style.ReportFontNameAction;
-import com.fr.design.actions.cell.style.ReportFontSizeAction;
-import com.fr.design.actions.cell.style.ReportFontUnderlineAction;
-import com.fr.design.actions.cell.style.StyleBackgroundAction;
-import com.fr.design.actions.columnrow.CancelColumnAction;
-import com.fr.design.actions.columnrow.CancelRowAction;
-import com.fr.design.actions.columnrow.ColumnHideAction;
-import com.fr.design.actions.columnrow.ColumnWidthAction;
-import com.fr.design.actions.columnrow.DeleteColumnAction;
-import com.fr.design.actions.columnrow.DeleteRowAction;
-import com.fr.design.actions.columnrow.FootColumnAction;
-import com.fr.design.actions.columnrow.FootRowAction;
-import com.fr.design.actions.columnrow.HeadColumnAction;
-import com.fr.design.actions.columnrow.HeadRowAction;
-import com.fr.design.actions.columnrow.InsertColumnAction;
-import com.fr.design.actions.columnrow.InsertRowAction;
-import com.fr.design.actions.columnrow.ResetColumnHideAction;
-import com.fr.design.actions.columnrow.ResetRowHideAction;
-import com.fr.design.actions.columnrow.RowHeightAction;
-import com.fr.design.actions.columnrow.RowHideAction;
 import com.fr.design.actions.core.ActionFactory;
 import com.fr.design.actions.edit.CopyAction;
 import com.fr.design.actions.edit.CutAction;
@@ -74,6 +25,7 @@ import com.fr.design.cell.clipboard.CellElementsClip;
 import com.fr.design.cell.clipboard.ElementsTransferable;
 import com.fr.design.cell.clipboard.FloatElementsClip;
 import com.fr.design.cell.editor.*;
+import com.fr.design.cell.editor.CellEditor;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.EditingState;
 import com.fr.design.designer.TargetComponent;
@@ -83,11 +35,7 @@ import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.imenu.UIPopupMenu;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
 import com.fr.design.mainframe.toolbar.ToolBarMenuDockPlus;
-import com.fr.design.menu.KeySetUtils;
+import com.fr.design.menu.*;
-import com.fr.design.menu.MenuDef;
-import com.fr.design.menu.NameSeparator;
-import com.fr.design.menu.ShortCut;
-import com.fr.design.menu.ToolBarDef;
 import com.fr.design.selection.QuickEditor;
 import com.fr.design.selection.Selectedable;
 import com.fr.design.selection.SelectionEvent;
@@ -95,11 +43,7 @@ import com.fr.design.selection.SelectionListener;
 import com.fr.general.ComparatorUtils;
 import com.fr.general.FRLogger;
 import com.fr.general.Inter;
-import com.fr.grid.Grid;
+import com.fr.grid.*;
-import com.fr.grid.GridColumn;
-import com.fr.grid.GridCorner;
-import com.fr.grid.GridRow;
-import com.fr.grid.GridUtils;
 import com.fr.grid.dnd.ElementCasePaneDropTarget;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.Selection;
@@ -119,9 +63,17 @@ import com.fr.report.elementcase.ElementCase;
 import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.stable.ArrayUtils;
 import com.fr.stable.ColumnRow;
-import com.fr.stable.Constants;
 import com.fr.stable.unit.FU;
 
+import javax.swing.*;
+import java.awt.*;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.DataFlavor;
+import java.awt.datatransfer.Transferable;
+import java.awt.event.*;
+import java.lang.reflect.Constructor;
+import java.util.Set;
+
 import static com.fr.design.gui.syntax.ui.rtextarea.RTADefaultInputMap.DEFAULT_MODIFIER;
 
 /**
@@ -209,7 +161,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         this.setLayout(new RGridLayout());
 
         //todo 直接修改分辨率
-        if (this.resolution == 0){
+        if (this.resolution == 0) {
             this.resolution = ScreenResolution.getScreenResolution();
         }
 
@@ -243,7 +195,6 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
     }
 
 
-
     public int getMenuState() {
         return DesignState.WORK_SHEET;
     }
@@ -294,7 +245,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         setFormatState(DesignerContext.FORMAT_STATE_NULL);
         formatBrush.setSelected(false);
         grid.setCursor(UIConstants.CELL_DEFAULT_CURSOR);
-        if(DesignerContext.getReferencedElementCasePane() == null){
+        if (DesignerContext.getReferencedElementCasePane() == null) {
             return;
         }
 
@@ -348,11 +299,11 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
     }
 
 
-    public void setResolution(int resolution){
+    public void setResolution(int resolution) {
         this.resolution = resolution;
     }
 
-    public int getResolution(){
+    public int getResolution() {
         return this.resolution;
     }
 
@@ -1149,7 +1100,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         HeadColumnAction headcolumnAction = new HeadColumnAction(this);
         FootColumnAction footcolumnAction = new FootColumnAction(this);
 
-        ColumnRow selectedCellPoint = GridUtils.getAdjustEventColumnRow_withresolution(this, evt.getX(), evt.getY(),this.resolution);
+        ColumnRow selectedCellPoint = GridUtils.getAdjustEventColumnRow_withresolution(this, evt.getX(), evt.getY(), this.resolution);
         ElementCase elementCase = this.getEditingElementCase();
         boolean cancel = false;
         ReportPageAttrProvider reportPageAttr = elementCase.getReportPageAttr();
@@ -1267,11 +1218,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
 
     protected ToolBarDef createAlignmentToolBar() {
         return ShortCut.asToolBarDef(new ShortCut[]{
-                new AlignmentAction(this, new Icon[]{
+                new AlignmentAction(this)}
-                        BaseUtils.readIcon("/com/fr/design/images/m_format/cellstyle/h_left_normal.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")},
-                        new Integer[]{Constants.LEFT, Constants.CENTER, Constants.RIGHT})}
         );
     }