diff --git a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
index 70fb3cd68..17d7882c1 100644
--- a/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
+++ b/designer-base/src/main/java/com/fr/design/constants/UIConstants.java
@@ -57,7 +57,7 @@ public interface UIConstants {
* Cell default cursor.
*/
public static final Cursor CELL_DEFAULT_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor(
- IOUtils.readImage("/com/fr/base/images/cell/cursor/cell_default.png"),
+ SVGLoader.load("/com/fr/design/standard/cell_default.svg"),
new Point(16, 16), "CellDefaultCursor");
public static final Cursor DRAW_CURSOR = Toolkit.getDefaultToolkit().createCustomCursor(
IOUtils.readImage("/com/fr/base/images/cell/cursor/cursor_draw.png"),
diff --git a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
index 9af937669..94995e0bc 100644
--- a/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
+++ b/designer-base/src/main/java/com/fr/design/file/MultiTemplateTabPane.java
@@ -89,9 +89,9 @@ public class MultiTemplateTabPane extends JComponent {
private static Icon LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_normal.svg");
private static Icon MOUSE_OVER_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg");
private static Icon MOUSE_PRESS_LIST_DOWN = IconUtils.readIcon("/com/fr/design/standard/list/list_pressed.svg");
- private static Icon CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/close_icon.png");
- private static Icon MOUSE_OVER_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/mouseoverclose icon.png");
- private static Icon MOUSE_PRESS_CLOSE = BaseUtils.readIcon("/com/fr/design/images/buttonicon/pressclose icon.png");
+ private static Icon CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_normal.svg");
+ private static Icon MOUSE_OVER_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_mouseover.svg");
+ private static Icon MOUSE_PRESS_CLOSE = IconUtils.readIcon("/com/fr/design/standard/close/close_press.svg");
private static final Icon WHITE_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/white_saving_close.gif"));
private static final Icon GREY_SAVING_CLOSE_ICON = new ImageIcon(IOUtils.readImage("/com/fr/design/images/file/grey_saving_close.gif"));
private static final String ELLIPSIS = "...";
diff --git a/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java b/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java
index 488cbad37..a8e45b24c 100644
--- a/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java
+++ b/designer-base/src/main/java/com/fr/design/gui/UILookAndFeel.java
@@ -160,10 +160,10 @@ public class UILookAndFeel extends MetalLookAndFeel {
table.put("Tree.collapsedIcon", loadIcon("TreePlusIcon.png", this));
table.put("Tree.openIcon", loadIcon("TreeFolderOpenedIcon.png", this));
table.put("Tree.closedIcon", loadIcon("TreeFolderClosedIcon.png", this));
- table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.png", this));
+ table.put("Tree.leafIcon", loadIcon("TreeLeafIcon.svg", this));
table.put("FileView.directoryIcon", loadIcon("DirectoryIcon.png", this));
table.put("FileView.computerIcon", loadIcon("ComputerIcon.png", this));
- table.put("FileView.fileIcon", loadIcon("FileIcon.png", this));
+ table.put("FileView.fileIcon", loadIcon("FileIcon.svg", this));
table.put("FileView.floppyDriveIcon", loadIcon("FloppyIcon.png", this));
table.put("FileView.hardDriveIcon", loadIcon("HarddiskIcon.png", this));
table.put("FileChooser.detailsViewIcon", loadIcon("FileDetailsIcon.png", this));
diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java b/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java
index fde3bf646..a4d66c438 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itree/UITreeUI.java
@@ -1,6 +1,7 @@
package com.fr.design.gui.itree;
import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
import com.fr.design.utils.ThemeUtils;
import javax.swing.*;
@@ -27,8 +28,8 @@ public class UITreeUI extends MetalTreeUI {
protected void installDefaults() {
super.installDefaults();
- setExpandedIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/minus.png"));
- setCollapsedIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/plus.png"));
+ setExpandedIcon(IconUtils.readIcon("/com/fr/design/standard/fileicon/minus.svg"));
+ setCollapsedIcon(IconUtils.readIcon("/com/fr/design/standard/fileicon/plus.svg"));
if (tree.getCellRenderer() instanceof DefaultTreeCellRenderer) {
DefaultTreeCellRenderer r = (DefaultTreeCellRenderer) tree.getCellRenderer();
r.setBackgroundNonSelectionColor(ThemeUtils.TEXT_BG_COLOR);
diff --git a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java
index b2956b70f..4bea4e315 100644
--- a/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java
+++ b/designer-base/src/main/java/com/fr/design/gui/itree/filetree/FileTreeIcon.java
@@ -1,6 +1,7 @@
package com.fr.design.gui.itree.filetree;
import com.fr.base.BaseUtils;
+import com.fr.base.svg.IconUtils;
import com.fr.design.ExtraDesignClassManager;
import com.fr.design.icon.LocalFileIcon;
import com.fr.design.icon.LockIcon;
@@ -24,9 +25,9 @@ public class FileTreeIcon {
public static final Icon BLANK_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/blank.gif");
- public static final Icon FOLDER_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/folder.png");
+ public static final Icon FOLDER_IMAGE_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/folder.svg");
public static final Icon FOLDER_HALF_IMAGE_ICON =
- BaseUtils.readIcon("/com/fr/design/images/gui/filetree_folder_half_authority_normal.png");
+ IconUtils.readIcon("/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg");
public static final Icon FILE_IMAGE_ICON = UIManager.getIcon("FileView.fileIcon");
@@ -45,14 +46,14 @@ public class FileTreeIcon {
public static final Icon CHT_FILE_IMAGE_ICON = BaseUtils.readIcon("/com/fr/design/images/gui/cht.png");
public static final Icon MODERN_CPT_FILE_IMAGE_ICON =
- BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png");
+ IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg");
public static final Icon MODERN_FRM_FILE_IMAGE_ICON =
- BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png");
+ IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg");
public static final Icon MODERN_CHT_FILE_IMAGE_ICON =
- BaseUtils.readIcon("/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png");
+ IconUtils.readIcon("/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg");
- public static final Icon CPTX_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon.png");
- public static final Icon CPTX_LOCKED_ICON = BaseUtils.readIcon("/com/fr/nx/app/designer/cptx_file_icon_locked.png");
+ public static final Icon CPTX_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_file_icon.svg");
+ public static final Icon CPTX_LOCKED_ICON = IconUtils.readIcon("/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg");
public static final LockIcon FOLDER_LOCK_ICON =
new LockIcon(BaseUtils.readImage("/com/fr/design/images/gui/fold.png"));
diff --git a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
index 8627f27a5..c7c32f795 100644
--- a/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
+++ b/designer-base/src/main/java/com/fr/design/style/color/UIToolbarColorButton.java
@@ -35,7 +35,7 @@ public class UIToolbarColorButton extends UICombinationButton implements PopupHi
private UIObserverListener uiObserverListener;
public UIToolbarColorButton(Icon icon) {
- super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup")));
+ super(new UIColorButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup")));
getLeftButton().setEventBanned(true);
getRightButton().addFocusListener(new FocusListener() {
diff --git a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
index bcf1ff768..d0fd62896 100644
--- a/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
+++ b/designer-base/src/main/java/com/fr/file/FileNodeFILE.java
@@ -2,6 +2,7 @@ package com.fr.file;
import com.fr.base.BaseUtils;
import com.fr.base.FRContext;
+import com.fr.base.svg.IconUtils;
import com.fr.design.file.TemplateResourceManager;
import com.fr.io.FineEncryptUtils;
import com.fr.base.io.XMLEncryptUtils;
@@ -168,7 +169,7 @@ public class FileNodeFILE implements FILE {
}
if (ComparatorUtils.equals(node.getEnvPath(), ProjectConstants.REPORTLETS_NAME)) {
- return BaseUtils.readIcon("/com/fr/base/images/oem/logo.png");
+ return IconUtils.readIcon("/com/fr/base/images/oem/logo.svg");
} else {
if (!hasFullAuth) {
diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png b/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png
deleted file mode 100644
index a1e244a9b..000000000
Binary files a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cht_file_icon_16x16.png and /dev/null differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png b/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png
deleted file mode 100644
index 15966d96d..000000000
Binary files a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_cpt_file_icon_16x16.png and /dev/null differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png b/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png
deleted file mode 100644
index 6258f4baf..000000000
Binary files a/designer-base/src/main/resources/com/fr/design/images/gui/modern_style_frm_file_icon_16x16.png and /dev/null differ
diff --git a/designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileIcon.svg b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileIcon.svg
new file mode 100644
index 000000000..8b3b40bbe
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/FileIcon.svg
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.svg b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.svg
new file mode 100644
index 000000000..8b3b40bbe
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/images/lookandfeel/TreeLeafIcon.svg
@@ -0,0 +1,8 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/background_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/background_normal.svg
new file mode 100644
index 000000000..577e8bd8a
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/background_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/bias/bias_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/bias/bias_disabled.svg
new file mode 100644
index 000000000..bc8c7ac44
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/bias/bias_disabled.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/bias/bias_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/bias/bias_normal.svg
new file mode 100644
index 000000000..e20ec42eb
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/bias/bias_normal.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/bindcolunm/bind_column_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/bindcolunm/bind_column_disabled.svg
new file mode 100644
index 000000000..6c80b82af
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/bindcolunm/bind_column_disabled.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/bindcolunm/bind_column_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/bindcolunm/bind_column_normal.svg
new file mode 100644
index 000000000..ea35ccb27
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/bindcolunm/bind_column_normal.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/cell_default.svg b/designer-base/src/main/resources/com/fr/design/standard/cell_default.svg
new file mode 100644
index 000000000..d897c1793
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/cell_default.svg
@@ -0,0 +1,13 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/chart/chart_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/chart/chart_disabled.svg
new file mode 100644
index 000000000..b2b724c64
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/chart/chart_disabled.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/chart/chart_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/chart/chart_normal.svg
new file mode 100644
index 000000000..59fc97567
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/chart/chart_normal.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/close/close_mouseover.svg b/designer-base/src/main/resources/com/fr/design/standard/close/close_mouseover.svg
new file mode 100644
index 000000000..bc0afc24d
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/close/close_mouseover.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/close/close_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/close/close_normal.svg
new file mode 100644
index 000000000..23c1cbe2c
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/close/close_normal.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/close/close_press.svg b/designer-base/src/main/resources/com/fr/design/standard/close/close_press.svg
new file mode 100644
index 000000000..bc0afc24d
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/close/close_press.svg
@@ -0,0 +1,9 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon.svg
new file mode 100644
index 000000000..79eff5861
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon.svg
@@ -0,0 +1,14 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg
new file mode 100644
index 000000000..1b662d0bf
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/cptx_file_icon_locked.svg
@@ -0,0 +1,13 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg
new file mode 100644
index 000000000..55be60bd4
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/filetree_folder_half_authority_normal.svg
@@ -0,0 +1,4 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg
new file mode 100644
index 000000000..ebafeec23
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/folder.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg
new file mode 100644
index 000000000..067df99f8
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/minus.svg
@@ -0,0 +1,3 @@
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg
new file mode 100644
index 000000000..0a764389b
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cht_file_icon_16x16.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg
new file mode 100644
index 000000000..d691f38b6
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_cpt_file_icon_16x16.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg
new file mode 100644
index 000000000..fa61a511f
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/modern_style_frm_file_icon_16x16.svg
@@ -0,0 +1,9 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg b/designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg
new file mode 100644
index 000000000..c2b0e9d9c
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/fileicon/plus.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/floatpop_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/floatpop_normal.svg
new file mode 100644
index 000000000..95806104d
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/floatpop_normal.svg
@@ -0,0 +1,9 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/foreground_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/foreground_normal.svg
new file mode 100644
index 000000000..0eaa40e93
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/foreground_normal.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/formula/formula_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/formula/formula_disabled.svg
new file mode 100644
index 000000000..18eb078e7
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/formula/formula_disabled.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/formula/formula_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/formula/formula_normal.svg
new file mode 100644
index 000000000..981ec11b4
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/formula/formula_normal.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/image/image_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/image/image_disabled.svg
new file mode 100644
index 000000000..b18058f59
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/image/image_disabled.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/image/image_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/image/image_normal.svg
new file mode 100644
index 000000000..19eb76199
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/image/image_normal.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/merge/merge_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/merge/merge_disabled.svg
new file mode 100644
index 000000000..a54f56a5b
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/merge/merge_disabled.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/merge/merge_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/merge/merge_normal.svg
new file mode 100644
index 000000000..ad7584497
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/merge/merge_normal.svg
@@ -0,0 +1,11 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/noboder.svg b/designer-base/src/main/resources/com/fr/design/standard/noboder.svg
new file mode 100644
index 000000000..b3ef846a9
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/noboder.svg
@@ -0,0 +1,3 @@
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/popup_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/popup_normal.svg
new file mode 100644
index 000000000..81e81b0a1
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/popup_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/richtext/richtext_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/richtext/richtext_disabled.svg
new file mode 100644
index 000000000..916c43303
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/richtext/richtext_disabled.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/richtext/richtext_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/richtext/richtext_normal.svg
new file mode 100644
index 000000000..3665dd01e
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/richtext/richtext_normal.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/subreport/sub_report_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/subreport/sub_report_disabled.svg
new file mode 100644
index 000000000..14ee3f16c
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/subreport/sub_report_disabled.svg
@@ -0,0 +1,12 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/subreport/sub_report_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/subreport/sub_report_normal.svg
new file mode 100644
index 000000000..d06985a52
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/subreport/sub_report_normal.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/text/text_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/text/text_disabled.svg
new file mode 100644
index 000000000..a25d12a70
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/text/text_disabled.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/text/text_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/text/text_normal.svg
new file mode 100644
index 000000000..bf3b0c687
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/text/text_normal.svg
@@ -0,0 +1,7 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/uimode/view_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/uimode/view_normal.svg
index e69de29bb..8a44f2805 100644
--- a/designer-base/src/main/resources/com/fr/design/standard/uimode/view_normal.svg
+++ b/designer-base/src/main/resources/com/fr/design/standard/uimode/view_normal.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg b/designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg
index e69de29bb..8a44f2805 100644
--- a/designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg
+++ b/designer-base/src/main/resources/com/fr/design/standard/uimode/view_pressed.svg
@@ -0,0 +1,7 @@
+
+
\ No newline at end of file
diff --git a/designer-base/src/main/resources/com/fr/design/standard/unmerge/unmerge_disabled.svg b/designer-base/src/main/resources/com/fr/design/standard/unmerge/unmerge_disabled.svg
new file mode 100644
index 000000000..bb9f7a22f
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/unmerge/unmerge_disabled.svg
@@ -0,0 +1,10 @@
+
+
diff --git a/designer-base/src/main/resources/com/fr/design/standard/unmerge/unmerge_normal.svg b/designer-base/src/main/resources/com/fr/design/standard/unmerge/unmerge_normal.svg
new file mode 100644
index 000000000..3af2c0ff3
--- /dev/null
+++ b/designer-base/src/main/resources/com/fr/design/standard/unmerge/unmerge_normal.svg
@@ -0,0 +1,8 @@
+
+
diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java
index 8752d54de..65744b9b6 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/BorderAction.java
@@ -3,10 +3,10 @@
*/
package com.fr.design.actions.cell;
-import com.fr.base.BaseUtils;
import com.fr.base.CellBorderStyle;
import com.fr.base.NameStyle;
import com.fr.base.Style;
+import com.fr.base.svg.IconUtils;
import com.fr.design.actions.ElementCaseAction;
import com.fr.design.actions.core.ActionFactory;
import com.fr.design.mainframe.ElementCasePane;
@@ -60,7 +60,7 @@ public class BorderAction extends ElementCaseAction implements ChangeListener {
public JComponent createToolBarComponent() {
Object object = this.getValue(UIToolbarBorderButton.class.getName());
if (object == null || !(object instanceof UIToolbarBorderButton)) {
- UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(BaseUtils.readIcon("/com/fr/design/images/m_format/noboder.png"), this.getEditingComponent());
+ UIToolbarBorderButton borderStylePane = new UIToolbarBorderButton(IconUtils.readIcon("/com/fr/design/standard/noboder.svg"), this.getEditingComponent());
this.putValue(UIToolbarBorderButton.class.getName(), borderStylePane);
borderStylePane.setEnabled(this.isEnabled());
borderStylePane.set4Toolbar();
diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java
index 52f753ad0..39e3d3426 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/UIToolbarBorderButton.java
@@ -47,7 +47,7 @@ public class UIToolbarBorderButton extends UICombinationButton implements PopupH
private JPopupMenu popupWin;
public UIToolbarBorderButton(Icon icon, ElementCasePane reportPane) {
- super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/images/gui/popup")));
+ super(new UIButton(icon), new UIButton(IconUtils.readIcon("/com/fr/design/standard/popup")));
this.reportPane = reportPane;
}
diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java
index 677fd0491..7893cfff4 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/ReportFontForegroundAction.java
@@ -51,7 +51,7 @@ public class ReportFontForegroundAction extends AbstractStyleAction implements C
public JComponent createToolBarComponent() {
Object object = this.getValue(UIToolbarColorButton.class.getName());
if (object == null || !(object instanceof UIToolbarColorButton)) {
- UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/foreground"));
+ UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/standard/foreground_normal.svg"));
this.putValue(UIToolbarColorButton.class.getName(), tbButton);
tbButton.set4Toolbar();
tbButton.setEnabled(this.isEnabled());
diff --git a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java b/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java
index 7d4376f3c..736fdd87f 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/cell/style/StyleBackgroundAction.java
@@ -60,7 +60,7 @@ public class StyleBackgroundAction extends AbstractStyleAction implements Change
public JComponent createToolBarComponent() {
Object object = this.getValue(UIToolbarColorButton.class.getName());
if (object == null || !(object instanceof UIToolbarColorButton)) {
- UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("/com/fr/design/images/gui/color/background"));
+ UIToolbarColorButton tbButton = new UIToolbarColorButton(IconUtils.readIcon("com/fr/design/standard/background_normal.svg"));
tbButton.set4Toolbar();
this.putValue(UIToolbarColorButton.class.getName(), tbButton);
diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java
index 0bf48382d..fcf5e2bb2 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/MergeCellAction.java
@@ -21,7 +21,7 @@ public class MergeCellAction extends ElementCaseAction {
this.setMenuKeySet(KeySetUtils.MERGE_CELL);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_edit/merge");
+ this.setSmallIcon("/com/fr/design/standard/merge/merge");
}
/**
diff --git a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java
index 8a35b16d3..f2b967925 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/edit/merge/UnmergeCellAction.java
@@ -20,7 +20,7 @@ public class UnmergeCellAction extends ElementCaseAction {
this.setMenuKeySet(KeySetUtils.UNMERGE_CELL);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_edit/unmerge");
+ this.setSmallIcon("/com/fr/design/standard/unmerge/unmerge");
}
@Override
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java
index e88366c15..efee97ad2 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/BiasCellAction.java
@@ -30,7 +30,7 @@ public class BiasCellAction extends AbstractCellAction implements WorkBookSuppor
this.setMenuKeySet(INSERT_SLOPE_LINE);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/bias");
+ this.setSmallIcon("/com/fr/design/standard/bias/bias");
}
public static final MenuKeySet INSERT_SLOPE_LINE = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java
index 7eb36fe24..205d39eac 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ChartCellAction.java
@@ -29,7 +29,7 @@ public class ChartCellAction extends AbstractCellAction implements WorkBookSuppo
this.setMenuKeySet(INSERT_CHART);
this.setName(getMenuKeySet().getMenuKeySetName()+ "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/chart");
+ this.setSmallIcon("/com/fr/design/standard/chart/chart");
}
public static final MenuKeySet INSERT_CHART = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java
index 498d1e00e..56d1d8b91 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/DSColumnCellAction.java
@@ -22,7 +22,7 @@ public class DSColumnCellAction extends AbstractCellAction implements WorkBookSu
this.setMenuKeySet(KeySetUtils.INSERT_DATA_COLUMN);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/bindColumn");
+ this.setSmallIcon("/com/fr/design/standard/bindcolunm/bind_column");
}
@Override
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java
index 4e0e858c3..4cfa7ad74 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/FormulaCellAction.java
@@ -26,7 +26,7 @@ public class FormulaCellAction extends AbstractCellAction implements WorkBookSup
this.setMenuKeySet(INSERT_FORMULA);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/formula");
+ this.setSmallIcon("/com/fr/design/standard/formula/formula");
}
public static final MenuKeySet INSERT_FORMULA = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java
index 758c4e335..8a9832ba0 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/GeneralCellAction.java
@@ -29,7 +29,7 @@ public class GeneralCellAction extends AbstractCellAction implements WorkBookSup
this.setMenuKeySet(INSERT_TEXT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/text");
+ this.setSmallIcon("/com/fr/design/standard/text/text");
}
public static final MenuKeySet INSERT_TEXT = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java
index a315aee69..5272909ae 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/ImageCellAction.java
@@ -29,7 +29,7 @@ public class ImageCellAction extends AbstractCellAction implements WorkBookSuppo
this.setMenuKeySet(INSERT_IMAGE);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/image");
+ this.setSmallIcon("/com/fr/design/standard/image/image");
}
public static final MenuKeySet INSERT_IMAGE = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java
index bbdba8312..e33d60d19 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/RichTextCellAction.java
@@ -25,7 +25,7 @@ public class RichTextCellAction extends AbstractCellAction implements WorkBookSu
this.setMenuKeySet(INSERT_RICHTEXT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/richtext");
+ this.setSmallIcon("/com/fr/design/standard/richtext/richtext");
}
@Override
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java
index 9fa6fabf4..9081b6712 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/cell/SubReportCellAction.java
@@ -24,7 +24,7 @@ public class SubReportCellAction extends AbstractCellAction {
this.setMenuKeySet(INSERT_SUB_REPORT);
this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/subReport");
+ this.setSmallIcon("/com/fr/design/standard/subreport/sub_report");
}
public static final MenuKeySet INSERT_SUB_REPORT = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java
index 58292bbf2..bfb1ce93d 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ChartFloatAction.java
@@ -49,7 +49,7 @@ public class ChartFloatAction extends ElementCaseAction {
this.setMenuKeySet(FLOAT_INSERT_CHART);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/chart");
+ this.setSmallIcon("/com/fr/design/standard/chart/m_insert/chart");
}
public static final MenuKeySet FLOAT_INSERT_CHART = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java
index 0251bf3d8..616bf7c9d 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/FormulaFloatAction.java
@@ -37,7 +37,7 @@ public class FormulaFloatAction extends ElementCaseAction {
this.setMenuKeySet(FLOAT_INSERT_FORMULA);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/formula");
+ this.setSmallIcon("/com/fr/design/standard/formula/formula");
}
public static final MenuKeySet FLOAT_INSERT_FORMULA = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java
index 7eb9146ea..ca33b15e8 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/ImageFloatAction.java
@@ -40,7 +40,7 @@ public class ImageFloatAction extends ElementCaseAction {
this.setMenuKeySet(FLOAT_INSERT_IMAGE);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/image");
+ this.setSmallIcon("/com/fr/design/standard/image/image");
}
public static final MenuKeySet FLOAT_INSERT_IMAGE = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java
index 32723cffa..59c2a3b0b 100644
--- a/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java
+++ b/designer-realize/src/main/java/com/fr/design/actions/insert/flot/TextBoxFloatAction.java
@@ -28,7 +28,7 @@ public class TextBoxFloatAction extends AbstractShapeAction {
this.setMenuKeySet(FLOAT_INSERT_TEXT);
this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic());
- this.setSmallIcon("/com/fr/design/images/m_insert/text");
+ this.setSmallIcon("/com/fr/design/standard/text/text");
}
public static final MenuKeySet FLOAT_INSERT_TEXT = new MenuKeySet() {
diff --git a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
index b4ca61729..0defeadfc 100644
--- a/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
+++ b/designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java
@@ -1347,7 +1347,7 @@ public abstract class ElementCasePane extends Tar
MenuDef insertFloatMenu = new MenuDef();
insertFloatMenu.setName(KeySetUtils.INSERT_FLOAT.getMenuKeySetName());
insertFloatMenu.setTooltip(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_T_Insert_Float"));
- insertFloatMenu.setIconPath("/com/fr/design/images/m_insert/floatPop");
+ insertFloatMenu.setIconPath("/com/fr/design/standard/floatpop");
UpdateAction[] actions = ActionFactory.createFloatInsertAction(ElementCasePane.class, this);
for (int i = 0; i < actions.length; i++) {