diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
index a31177374..2dc001a49 100644
--- a/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
@@ -3,7 +3,7 @@
*/
package com.fr.design.actions.edit;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.TemplateComponentAction;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.designer.TargetComponent;
@@ -22,7 +22,8 @@ public class CopyAction extends TemplateComponentAction {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"));
this.setMnemonic('C');
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_disabled.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
this.setEnabled(!DesignModeContext.isBanCopyAndCut());
}
@@ -32,4 +33,4 @@ public class CopyAction extends TemplateComponentAction {
DesignModeContext.doCopy(getEditingComponent());
return false;
}
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
index c03d5d3de..813524984 100644
--- a/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
@@ -3,11 +3,10 @@
*/
package com.fr.design.actions.edit;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.TemplateComponentAction;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.designer.TargetComponent;
-import com.fr.general.IOUtils;
import javax.swing.KeyStroke;
import java.awt.event.KeyEvent;
@@ -26,7 +25,8 @@ public class CutAction extends TemplateComponentAction {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
this.setMnemonic('T');
- this.setSmallIcon(IOUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_disabled.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
this.setEnabled(!DesignModeContext.isBanCopyAndCut());
}
@@ -35,4 +35,4 @@ public class CutAction extends TemplateComponentAction {
public boolean executeActionReturnUndoRecordNeeded() {
return DesignModeContext.doCut(getEditingComponent());
}
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java b/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
index 6c8a9a515..39adec806 100644
--- a/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
+++ b/designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
@@ -3,7 +3,7 @@
*/
package com.fr.design.actions.edit;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.TemplateComponentAction;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.designer.TargetComponent;
@@ -25,7 +25,8 @@ public class PasteAction extends TemplateComponentAction {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
this.setMnemonic('P');
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_disabled.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
}
@@ -33,4 +34,4 @@ public class PasteAction extends TemplateComponentAction {
public boolean executeActionReturnUndoRecordNeeded() {
return DesignModeContext.doPaste(getEditingComponent());
}
-}
\ No newline at end of file
+}
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg
new file mode 100644
index 000000000..7866d7b44
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg
new file mode 100644
index 000000000..3f1e16e89
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg
new file mode 100644
index 000000000..7b44ca672
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg
new file mode 100644
index 000000000..c821dbecf
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg
@@ -0,0 +1,12 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg
new file mode 100644
index 000000000..ca7b9f1c6
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg
new file mode 100644
index 000000000..72f9e2933
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg
new file mode 100644
index 000000000..8f4820de1
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg
new file mode 100644
index 000000000..31127a957
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg
new file mode 100644
index 000000000..c4982036b
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg
new file mode 100644
index 000000000..a4cc6a17d
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg
new file mode 100644
index 000000000..009e60355
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg
new file mode 100644
index 000000000..c2536b377
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg
@@ -0,0 +1,10 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg
new file mode 100644
index 000000000..5ae337072
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg
@@ -0,0 +1,11 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg
new file mode 100644
index 000000000..93b0f0302
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg
new file mode 100644
index 000000000..90832de79
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java
index 47f7e3924..2ae2ae973 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java
@@ -1,6 +1,6 @@
package com.fr.design.designer.beans.actions;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
import com.fr.design.mainframe.FormDesigner;
@@ -16,7 +16,8 @@ public class CopyAction extends FormWidgetEditAction {
super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Copy"));
this.setMnemonic('C');
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/copy.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/copy_disabled.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_C, DEFAULT_MODIFIER));
setUpdateBehavior(new ComponentEnable());
this.setEnabled(!DesignModeContext.isBanCopyAndCut());
@@ -27,4 +28,4 @@ public class CopyAction extends FormWidgetEditAction {
DesignModeContext.doCopy(getEditingComponent());
return false;
}
-}
\ No newline at end of file
+}
diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java
index 421cae2e6..f366602f9 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java
@@ -1,6 +1,6 @@
package com.fr.design.designer.beans.actions;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
import com.fr.design.mainframe.FormDesigner;
@@ -16,7 +16,8 @@ public class CutAction extends FormWidgetEditAction {
super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_M_Edit_Cut"));
this.setMnemonic('T');
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/cut.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/cut_disabled.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_X, DEFAULT_MODIFIER));
this.setUpdateBehavior(new ComponentEnable());
this.setEnabled(!DesignModeContext.isBanCopyAndCut());
@@ -26,4 +27,4 @@ public class CutAction extends FormWidgetEditAction {
public boolean executeActionReturnUndoRecordNeeded() {
return DesignModeContext.doCut(getEditingComponent());
}
-}
\ No newline at end of file
+}
diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java
index 7492f8cc8..94e434cc8 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java
@@ -7,7 +7,7 @@ import java.awt.event.KeyEvent;
import javax.swing.*;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.designer.beans.actions.behavior.ComponentEnable;
import com.fr.design.mainframe.FormDesigner;
@@ -24,7 +24,8 @@ public class FormDeleteAction extends FormWidgetEditAction {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
this.setMnemonic('D');
// Richie:删除菜单图标
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_disabled.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
this.setUpdateBehavior(new ComponentEnable());
}
diff --git a/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java b/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java
index c02295f0f..1e6a17b2e 100644
--- a/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java
+++ b/designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java
@@ -1,6 +1,6 @@
package com.fr.design.designer.beans.actions;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.base.mode.DesignModeContext;
import com.fr.design.mainframe.FormDesigner;
@@ -15,7 +15,8 @@ public class PasteAction extends FormWidgetEditAction {
super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_M_Edit_Paste"));
this.setMnemonic('P');
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/paste.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/paste_disabled.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_V, DEFAULT_MODIFIER));
}
@@ -29,4 +30,4 @@ public class PasteAction extends FormWidgetEditAction {
this.setEnabled(true);
}
-}
\ No newline at end of file
+}
diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java
index e7ca0bd96..5023ab5a4 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java
@@ -3,7 +3,7 @@
*/
package com.fr.design.actions.edit;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.ElementCaseAction;
import com.fr.design.mainframe.ElementCasePane;
@@ -17,18 +17,17 @@ public class DeleteAction extends ElementCaseAction {
*/
public DeleteAction(ElementCasePane t) {
super(t);
-
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
this.setMnemonic('D');
//Richie:删除菜单图标
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_normal.svg"));
// this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_BACK_SPACE, 0));
}
-
+
@Override
public boolean executeActionReturnUndoRecordNeeded() {
ElementCasePane ePane = getEditingComponent();
-
+
return ePane.getSelection().triggerDeleteAction(ePane);
}
}
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/FormatBrushAction.java b/designer-realize/src/main/java/com/fr/design/mainframe/FormatBrushAction.java
index 76298161f..b2b29421c 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/FormatBrushAction.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/FormatBrushAction.java
@@ -2,6 +2,7 @@ package com.fr.design.mainframe;
import com.fr.base.BaseUtils;
import com.fr.base.Style;
+import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.ElementCaseAction;
import com.fr.grid.selection.CellSelection;
@@ -31,7 +32,7 @@ public class FormatBrushAction extends ElementCaseAction {
super(t);
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_FormatBrush"));
this.setMnemonic('B');
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/formatBrush.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_edit/formatBrush_normal.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_B, DEFAULT_MODIFIER));
}
diff --git a/designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java b/designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java
index 908e235a6..d9a8cbf35 100644
--- a/designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java
+++ b/designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java
@@ -8,7 +8,7 @@ import java.awt.event.KeyEvent;
import javax.swing.KeyStroke;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.actions.TemplateComponentActionInterface;
import com.fr.design.actions.UpdateAction;
@@ -26,7 +26,8 @@ public class DeleteBlockAction extends UpdateAction implements TemplateComponent
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_Edit_Delete"));
this.setMnemonic('D');
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0));
- this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_report/delete.png"));
+ this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_normal.svg"));
+ this.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_report/delete_disabled.svg"));
}
@Override
diff --git a/designer-realize/src/main/java/com/fr/start/MainDesigner.java b/designer-realize/src/main/java/com/fr/start/MainDesigner.java
index ff3aadd36..a538416fc 100644
--- a/designer-realize/src/main/java/com/fr/start/MainDesigner.java
+++ b/designer-realize/src/main/java/com/fr/start/MainDesigner.java
@@ -1,6 +1,6 @@
package com.fr.start;
-import com.fr.base.BaseUtils;
+import com.fr.base.svg.SVGIcon;
import com.fr.base.vcs.DesignerMode;
import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.file.WebPreviewUtils;
@@ -222,7 +222,8 @@ public class MainDesigner extends BaseDesigner {
private void createSaveButton() {
- saveButton = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/save.png"));
+ saveButton = new UIButton(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/save_normal.svg"));
+ saveButton.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/save_disabled.svg"));
saveButton.setToolTipText(KeySetUtils.SAVE_TEMPLATE.getMenuKeySetName());
saveButton.set4ToolbarButton();
saveButton.addActionListener(new ActionListener() {
@@ -238,7 +239,8 @@ public class MainDesigner extends BaseDesigner {
private void createUndoButton() {
- undo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/undo.png"));
+ undo = new UIButton(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/undo_normal.svg"));
+ undo.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/undo_disabled.svg"));
undo.setToolTipText(KeySetUtils.UNDO.getMenuKeySetName());
undo.set4ToolbarButton();
undo.addActionListener(new ActionListener() {
@@ -253,7 +255,8 @@ public class MainDesigner extends BaseDesigner {
}
private void createRedoButton() {
- redo = new UIButton(BaseUtils.readIcon("/com/fr/design/images/buttonicon/redo.png"));
+ redo = new UIButton(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/redo_normal.svg"));
+ redo.setDisabledIcon(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/redo_disabled.svg"));
redo.setToolTipText(KeySetUtils.REDO.getMenuKeySetName());
redo.set4ToolbarButton();
redo.addActionListener(new ActionListener() {
diff --git a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
index 1204f9a88..3fddca218 100644
--- a/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
+++ b/designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
@@ -94,8 +94,14 @@ public class ImagePreLoader {
"com/fr/design/images/m_report/close_over.png",
"com/fr/design/images/m_report/close_press.png",
"com/fr/design/images/buttonicon/save.png",
+ "com/fr/design/images/buttonicon/save_normal.svg",
+ "com/fr/design/images/buttonicon/save_disabled.svg",
"com/fr/design/images/buttonicon/undo.png",
+ "com/fr/design/images/buttonicon/undo_normal.svg",
+ "com/fr/design/images/buttonicon/undo_disabled.svg",
"com/fr/design/images/buttonicon/redo.png",
+ "com/fr/design/images/buttonicon/redo_normal.svg",
+ "com/fr/design/images/buttonicon/redo_disabled.svg",
"com/fr/design/images/buttonicon/additicon_grey.png",
"com/fr/design/images/buttonicon/addicon.png",
"com/fr/design/images/buttonicon/list_normal.png",
@@ -130,6 +136,8 @@ public class ImagePreLoader {
"com/fr/design/images/buttonicon/propertiestab/cellelement_selected.png",
"com/fr/design/images/log/selectedall.png",
"com/fr/design/images/m_edit/copy.png",
+ "com/fr/design/images/m_edit/copy_normal.svg",
+ "com/fr/design/images/m_edit/copy_disabled.svg",
"com/fr/design/images/log/clear.png",
"com/fr/design/images/log/clear.png",
"com/fr/design/images/log/selectedall.png",
@@ -233,8 +241,14 @@ public class ImagePreLoader {
"com/fr/web/images/form/forbid.png",
"com/fr/web/images/form/resources/layout_absolute.png",
"com/fr/design/images/m_edit/cut.png",
+ "com/fr/design/images/m_edit/cut_normal.svg",
+ "com/fr/design/images/m_edit/cut_disabled.svg",
"com/fr/design/images/m_edit/paste.png",
+ "com/fr/design/images/m_edit/paste_normal.svg",
+ "com/fr/design/images/m_edit/paste_disabled.svg",
"com/fr/design/images/m_report/delete.png",
+ "com/fr/design/images/m_report/delete_normal.svg",
+ "com/fr/design/images/m_report/delete_disabled.svg",
"com/fr/design/images/toolbarbtn/parametersetting.png",
"com/fr/base/images/oem/addworksheet.png",
"com/fr/design/images/sheet/addpolysheet.png",
@@ -249,6 +263,7 @@ public class ImagePreLoader {
"com/fr/design/images/data/source/normalUp20.png",
"com/fr/design/images/data/source/hoverUp20.png",
"com/fr/design/images/m_edit/formatBrush.png",
+ "com/fr/design/images/m_edit/formatBrush_normal.svg",
"com/fr/design/images/expand/none16x16_selected@1x.png",
"com/fr/design/images/expand/vertical.png",
"com/fr/design/images/expand/vertical_selected@1x.png",