fanruan
/
design
6
0
Fork 2
Code Issues 2 Pull Requests Releases Wiki Activity
Browse Source

REPORT-42238 【10.0.13】JDK11设计器图标模糊问题优化 

No.3: 设计器菜单栏下的工具栏-保存、撤销、重做、剪切、复制、粘贴、格式刷、删除
research/11.0
Yvan 4 years ago
parent
1df5af6bc3
commit
276fd0a836
27 changed files with 190 additions and 33 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
  2. 8
      designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
  3. 7
      designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
  4. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg
  5. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg
  6. 12
      designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg
  7. 12
      designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg
  8. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg
  9. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg
  10. 7
      designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg
  11. 10
      designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg
  12. 9
      designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg
  13. 10
      designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg
  14. 9
      designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg
  15. 10
      designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg
  16. 11
      designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg
  17. 7
      designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg
  18. 7
      designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg
  19. 7
      designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java
  20. 7
      designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java
  21. 5
      designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java
  22. 7
      designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java
  23. 9
      designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java
  24. 3
      designer-realize/src/main/java/com/fr/design/mainframe/FormatBrushAction.java
  25. 5
      designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java
  26. 11
      designer-realize/src/main/java/com/fr/start/MainDesigner.java
  27. 15
      designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

7
designer-base/src/main/java/com/fr/design/actions/edit/CopyAction.java
Unescape View File

@ -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;
}
}
}

8
designer-base/src/main/java/com/fr/design/actions/edit/CutAction.java
Unescape View File

@ -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());
}
}
}

7
designer-base/src/main/java/com/fr/design/actions/edit/PasteAction.java
Unescape View File

@ -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());
}
}
}

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_disabled.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_重做_disabled</title>
<g id="icon_重做_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 761 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/redo_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_重做_normal</title>
<g id="icon_重做_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6.8572898,0 L6.85780413,3.75935325 C12.0003021,4.36445666 16,9.0018239 16,14.6328027 C16,15.0967651 15.9728466,15.5539819 15.9201377,16.0027536 C15.3354673,12.1131951 11.5781141,9.03890217 6.8579248,8.60686889 L6.8572898,12.3078614 L0,6.15331536 L6.8572898,0 Z" id="Combined-Shape" fill="#79B2EE" transform="translate(8.000000, 8.000171) scale(-1, 1) translate(-8.000000, -8.000171) "></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 743 B

12
designer-base/src/main/resources/com/fr/design/images/buttonicon/save_disabled.svg
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_保存_disabled</title>
<g id="icon_保存_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group">
<path d="M1,0 L13,0 L13,0 L16,3 L16,15 C16,15.5522847 15.5522847,16 15,16 L1,16 C0.44771525,16 6.76353751e-17,15.5522847 0,15 L0,1 C-6.76353751e-17,0.44771525 0.44771525,1.01453063e-16 1,0 Z" id="Rectangle-109" fill="#333334" opacity="0.3"></path>
<path d="M11.5,1 C11.7761424,1 12,1.22385763 12,1.5 L12,6.5 C12,6.77614237 11.7761424,7 11.5,7 L2.5,7 C2.22385763,7 2,6.77614237 2,6.5 L2,1.5 C2,1.22385763 2.22385763,1 2.5,1 L11.5,1 Z M9.5,2 L7.5,2 C7.22385763,2 7,2.22385763 7,2.5 L7,2.5 L7,5.5 C7,5.77614237 7.22385763,6 7.5,6 L7.5,6 L9.5,6 C9.77614237,6 10,5.77614237 10,5.5 L10,5.5 L10,2.5 C10,2.22385763 9.77614237,2 9.5,2 L9.5,2 Z" id="Combined-Shape" fill="#FFFFFF"></path>
<rect id="Rectangle-110" fill="#FFFFFF" x="2" y="10" width="10" height="1" rx="0.5"></rect>
<rect id="Rectangle-110-Copy" fill="#FFFFFF" x="2" y="13" width="7" height="1" rx="0.5"></rect>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

12
designer-base/src/main/resources/com/fr/design/images/buttonicon/save_normal.svg
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_保存_normal</title>
<g id="icon_保存_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group">
<path d="M1,0 L13,0 L13,0 L16,3 L16,15 C16,15.5522847 15.5522847,16 15,16 L1,16 C0.44771525,16 6.76353751e-17,15.5522847 0,15 L0,1 C-6.76353751e-17,0.44771525 0.44771525,1.01453063e-16 1,0 Z" id="Rectangle-109" fill="#68A3E0"></path>
<path d="M11.5,1 C11.7761424,1 12,1.22385763 12,1.5 L12,6.5 C12,6.77614237 11.7761424,7 11.5,7 L2.5,7 C2.22385763,7 2,6.77614237 2,6.5 L2,1.5 C2,1.22385763 2.22385763,1 2.5,1 L11.5,1 Z M9.5,2 L7.5,2 C7.22385763,2 7,2.22385763 7,2.5 L7,2.5 L7,5.5 C7,5.77614237 7.22385763,6 7.5,6 L7.5,6 L9.5,6 C9.77614237,6 10,5.77614237 10,5.5 L10,5.5 L10,2.5 C10,2.22385763 9.77614237,2 9.5,2 L9.5,2 Z" id="Combined-Shape" fill="#FFFFFF"></path>
<rect id="Rectangle-110" fill="#FFFFFF" x="2" y="10" width="10" height="1" rx="0.5"></rect>
<rect id="Rectangle-110-Copy" fill="#FFFFFF" x="2" y="13" width="7" height="1" rx="0.5"></rect>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_disabled.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_撤销_disabled</title>
<g id="icon_撤销_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 693 B

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/undo_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_撤销_normal</title>
<g id="icon_撤销_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6.85716122,0 L6.85767554,3.75928276 C12.0000771,4.36437483 15.9997,9.00165512 15.9997,14.6325283 C15.9997,15.0954502 15.9726677,15.5516567 15.9201905,15.9994594 C15.3332461,12.1113861 11.5766825,9.03862153 6.85779622,8.60670751 L6.85716122,12.3076306 L0,6.15319999 L6.85716122,0 Z" id="Combined-Shape" fill="#79B2EE"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 675 B

7
designer-base/src/main/resources/com/fr/design/images/m_edit/copy_disabled.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_复制_disabled</title>
<g id="icon_复制_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M6,0 L9,3 L9,4 L13,4 L16,7 L16,16 L6,16 L6,11 L0,11 L0,0 L6,0 Z M8,4.999 L7,5 L6.999,10 L7,10 L7,11 L6.999,11 L7,15 L15,15 L14.999,8 L12,8 L12,4.999 L9,4.999 L9,5 L8,5 L8,4.999 Z M11,6 L11,9 L14,9 L14,14 L8,14 L8,6 L11,6 Z M5,1 L1,1 L1,10 L6,10 L6,4 L5,4 L5,1 Z M4,2 L4,5 L5,5 L5,9 L2,9 L2,2 L4,2 Z M13,5.414 L13,7 L14.585,7 L13,5.414 Z M6,1.415 L6,3 L7.586,3 L6,1.415 Z" id="形状结合" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 780 B

10
designer-base/src/main/resources/com/fr/design/images/m_edit/copy_normal.svg
Unescape View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_复制_normal</title>
<g id="icon_复制_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M6,0 L9,3 L9,5 L13,5 L15,7 L15,16 L7,16 L7,11 L0,11 L0,0 L6,0 Z" id="Combined-Shape" fill="#FFFFFF"></path>
<path d="M16,16 L6,16 L6,4 L13,4 L16,7 L16,16 Z M12,4.999 L7,5 L7,15 L15,15 L14.999,8 L12,8 L12,4.999 Z M13,5.414 L13,7 L14.585,7 L13,5.414 Z" id="Combined-Shape" fill="#48494B" fill-rule="nonzero"></path>
<path d="M6,0 L9,3 L9,5 L8,5 L8,4 L5,4 L5,1 L1,1 L1,10 L7,10 L7,11 L0,11 L0,0 L6,0 Z M6,1.415 L6,3 L7.586,3 L6,1.415 Z" id="Combined-Shape" fill="#48494B" fill-rule="nonzero"></path>
<path d="M8,6 L11,6 L11,9 L14,9 L14,14 L8,14 L8,6 Z M4,2 L4,5 L5,5 L5,9 L2,9 L2,2 L4,2 Z" id="Combined-Shape" fill="#FEF6DE"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1003 B

9
designer-base/src/main/resources/com/fr/design/images/m_edit/cut_disabled.svg
Unescape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_剪切_disabled</title>
<g id="icon_剪切_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<g id="Group" fill="#333334">
<path d="M3.51936865,0 L7.999,5.952 L12.4806877,0.000625592417 C12.4806877,0.000625592417 12.9382732,0.000625592417 12.9943831,0.431985374 L12.9995493,0.549061611 C12.9135928,3.04508847 12.1467387,4.16795083 11.2925568,5.28865864 L11.1806953,5.43493839 L9.16,7.494 L10.2816001,8.98350711 L10.723868,9.55112954 C11.2570654,9.20227675 11.891107,9 12.5714286,9 C14.4649763,9 16,10.5670034 16,12.5 C16,14.4329966 14.4649763,16 12.5714286,16 C10.6778809,16 9.14285714,14.4329966 9.14285714,12.5 C9.14285714,11.74944 9.37428928,11.0540601 9.76827966,10.4841689 L7.999,8.679 L6.23103458,10.4831773 C6.62544216,11.0532534 6.85714286,11.7490047 6.85714286,12.5 C6.85714286,14.4329966 5.32211914,16 3.42857143,16 C1.53502371,16 0,14.4329966 0,12.5 C0,10.5670034 1.53502371,9 3.42857143,9 C4.10846943,9 4.74214496,9.20202493 5.2751359,9.55047806 L5.71732093,8.9841327 L6.838,7.495 L4.81822572,5.43535545 C3.95757207,4.31224329 3.15843901,3.24562813 3.01539531,0.867253057 L3.00050704,0.549478673 C2.98120584,0 3.51936865,0 3.51936865,0 Z M12.5714286,10.75 C11.6246547,10.75 10.8571429,11.5335017 10.8571429,12.5 C10.8571429,13.4664983 11.6246547,14.25 12.5714286,14.25 C13.5182024,14.25 14.2857143,13.4664983 14.2857143,12.5 C14.2857143,11.5335017 13.5182024,10.75 12.5714286,10.75 Z M3.42857143,10.75 C2.48179757,10.75 1.71428571,11.5335017 1.71428571,12.5 C1.71428571,13.4664983 2.48179757,14.25 3.42857143,14.25 C4.37534529,14.25 5.14285714,13.4664983 5.14285714,12.5 C5.14285714,11.5335017 4.37534529,10.75 3.42857143,10.75 Z" id="形状结合"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

10
designer-base/src/main/resources/com/fr/design/images/m_edit/cut_normal.svg
Unescape View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_剪切_normal</title>
<g id="icon_剪切_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<g id="Group">
<path d="M3.51936865,0 L7.999,5.952 L12.4806877,0.000625592417 C12.4806877,0.000625592417 12.9382732,0.000625592417 12.9943831,0.431985374 L12.9995493,0.549061611 C12.9098555,3.15361137 12.0787686,4.26299526 11.1806953,5.43493839 L11.1806953,5.43493839 L9.16,7.494 L10.2816001,8.98350711 L11.1762673,10.1304265 L10.2747879,11 L7.999,8.679 L5.72413312,10.9995829 L4.82265364,10.1300095 L5.71732093,8.9841327 L6.838,7.495 L4.81822572,5.43535545 C3.95757207,4.31224329 3.15843901,3.24562813 3.01539531,0.867253057 L3.00050704,0.549478673 C2.98120584,0 3.51936865,0 3.51936865,0 L3.51936865,0 Z" id="Combined-Shape" fill="#48494B"></path>
<path d="M12.5714286,14.25 C13.5182024,14.25 14.2857143,13.4664983 14.2857143,12.5 C14.2857143,11.5335017 13.5182024,10.75 12.5714286,10.75 C11.6246547,10.75 10.8571429,11.5335017 10.8571429,12.5 C10.8571429,13.4664983 11.6246547,14.25 12.5714286,14.25 Z M12.5714286,16 C10.6778809,16 9.14285714,14.4329966 9.14285714,12.5 C9.14285714,10.5670034 10.6778809,9 12.5714286,9 C14.4649763,9 16,10.5670034 16,12.5 C16,14.4329966 14.4649763,16 12.5714286,16 Z M3.42857143,14.25 C4.37534529,14.25 5.14285714,13.4664983 5.14285714,12.5 C5.14285714,11.5335017 4.37534529,10.75 3.42857143,10.75 C2.48179757,10.75 1.71428571,11.5335017 1.71428571,12.5 C1.71428571,13.4664983 2.48179757,14.25 3.42857143,14.25 Z M3.42857143,16 C1.53502371,16 0,14.4329966 0,12.5 C0,10.5670034 1.53502371,9 3.42857143,9 C5.32211914,9 6.85714286,10.5670034 6.85714286,12.5 C6.85714286,14.4329966 5.32211914,16 3.42857143,16 Z" id="Combined-Shape" fill="#419BF9" fill-rule="nonzero"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.9 KiB

9
designer-base/src/main/resources/com/fr/design/images/m_edit/formatBrush_normal.svg
Unescape View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_格式刷_normal</title>
<g id="icon_格式刷_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M9.90916218,9.40347873 L6.60575211,6.10113669 C6.60575211,6.10113669 2.20120535,7.20120535 -8.8817842e-15,5 C-8.8817842e-15,5 0.803156926,15.899224 8.54422261,15.899224 C8.54422261,15.899224 9.90916218,12.7068888 9.90916218,9.40347873" id="Combined-Shape" fill="#F1AD14"></path>
<path d="M10.824895,8.55608876 C10.5906634,8.79032041 10.2126459,8.79032041 9.97957384,8.55608876 L7.44361032,6.02012524 C7.21053823,5.78705315 7.21053823,5.40903572 7.44361032,5.17480407 C7.67668241,4.94173198 8.05469984,4.94173198 8.28777193,5.17480407 L10.824895,7.71076759 C11.0579671,7.94499924 11.0579671,8.32301667 10.824895,8.55608876" id="Fill-6" fill="#62646E"></path>
<path d="M9.03553391,2.03553391 L14.5355339,2.03553391 C15.363961,2.03553391 16.0355339,2.70710678 16.0355339,3.53553391 C16.0355339,4.36396103 15.363961,5.03553391 14.5355339,5.03553391 L9.03553391,5.03553391 L9.03553391,5.03553391 L9.03553391,2.03553391 Z" id="Rectangle-111" fill="#62646E" transform="translate(12.535534, 3.535534) rotate(-45.000000) translate(-12.535534, -3.535534) "></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

10
designer-base/src/main/resources/com/fr/design/images/m_edit/paste_disabled.svg
Unescape View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_粘贴_disabled</title>
<g id="icon_粘贴_disabled" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd" opacity="0.3">
<path d="M0,2 L10,2 L10,12 L0,12 L0,2 Z M0,0 L2,0 L2,2 L0,2 L0,0 Z M10,4 L10,12 L6,12 L6,4 L10,4 Z M10,0 L10,2 L8,2 L8,0 L10,0 Z" id="Combined-Shape" fill="#333334"></path>
<path d="M16,16 L6,16 L6,4 L13,4 L16,7 L16,16 Z M12,4.999 L7,5 L7,15 L15,15 L14.999,8 L12,8 L12,4.999 Z M13,5.414 L13,7 L14.585,7 L13,5.414 Z" id="Combined-Shape" fill="#333334"></path>
<path d="M8,6 L11,6 L11,9 L14,9 L14,14 L8,14 L8,6 Z" id="形状结合" fill="#333334"></path>
<polygon id="Combined-Shape" fill="#333334" points="3 0 7 0 7 1 3 1"></polygon>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 915 B

11
designer-base/src/main/resources/com/fr/design/images/m_edit/paste_normal.svg
Unescape View File

@ -0,0 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_粘贴_normal</title>
<g id="icon_粘贴_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M0,2 L10,2 L10,12 L0,12 L0,2 Z M0,0 L2,0 L2,2 L0,2 L0,0 Z M10,4 L10,12 L6,12 L6,4 L10,4 Z M10,0 L10,2 L8,2 L8,0 L10,0 Z" id="Combined-Shape" fill="#F1AD14"></path>
<path d="M16,16 L6,16 L6,4 L13,4 L16,7 L16,16 Z M12,4.999 L7,5 L7,15 L15,15 L14.999,8 L12,8 L12,4.999 Z M13,5.414 L13,7 L14.585,7 L13,5.414 Z" id="Combined-Shape" fill="#48494B" fill-rule="nonzero"></path>
<rect id="Rectangle-3" fill="#FEF6DE" x="8" y="6" width="3" height="4"></rect>
<rect id="Rectangle-4" fill="#FEF6DE" x="8" y="9" width="6" height="5"></rect>
<polygon id="Combined-Shape" fill="#BB5A1D" points="3 0 7 0 7 1 3 1"></polygon>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 989 B

7
designer-base/src/main/resources/com/fr/design/images/m_report/delete_disabled.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_关闭_normal</title>
<g id="icon_关闭_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M7.89949494,0.899494937 C8.28609426,0.899494937 8.59949494,1.21820884 8.59949494,1.59375711 L8.59849494,7.19949494 L14.2052328,7.19949494 C14.5567106,7.19949494 14.8471855,7.46057376 14.8931571,7.80394288 L14.8994949,7.89949494 C14.8994949,8.28609426 14.580781,8.59949494 14.2052328,8.59949494 L8.59849494,8.59849494 L8.59949494,14.2052328 C8.59949494,14.5567106 8.33841611,14.8471855 7.99504699,14.8931571 L7.89949494,14.8994949 C7.51289561,14.8994949 7.19949494,14.580781 7.19949494,14.2052328 L7.19949494,8.59849494 L1.59375711,8.59949494 C1.24227924,8.59949494 0.951804388,8.33841611 0.905832732,7.99504699 L0.899494937,7.89949494 C0.899494937,7.51289561 1.21820884,7.19949494 1.59375711,7.19949494 L7.19949494,7.19949494 L7.19949494,1.59375711 C7.19949494,1.24227924 7.46057376,0.951804388 7.80394288,0.905832732 L7.89949494,0.899494937 Z" id="Combined-Shape" fill="#333334" transform="translate(7.899495, 7.899495) rotate(45.000000) translate(-7.899495, -7.899495) "></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

7
designer-base/src/main/resources/com/fr/design/images/m_report/delete_normal.svg
Unescape View File

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
<title>icon_关闭_red</title>
<g id="icon_关闭_red" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M7.89949494,0.899494937 C8.28609426,0.899494937 8.59949494,1.21820884 8.59949494,1.59375711 L8.59849494,7.19949494 L14.2052328,7.19949494 C14.5567106,7.19949494 14.8471855,7.46057376 14.8931571,7.80394288 L14.8994949,7.89949494 C14.8994949,8.28609426 14.580781,8.59949494 14.2052328,8.59949494 L8.59849494,8.59849494 L8.59949494,14.2052328 C8.59949494,14.5567106 8.33841611,14.8471855 7.99504699,14.8931571 L7.89949494,14.8994949 C7.51289561,14.8994949 7.19949494,14.580781 7.19949494,14.2052328 L7.19949494,8.59849494 L1.59375711,8.59949494 C1.24227924,8.59949494 0.951804388,8.33841611 0.905832732,7.99504699 L0.899494937,7.89949494 C0.899494937,7.51289561 1.21820884,7.19949494 1.59375711,7.19949494 L7.19949494,7.19949494 L7.19949494,1.59375711 C7.19949494,1.24227924 7.46057376,0.951804388 7.80394288,0.905832732 L7.89949494,0.899494937 Z" id="Combined-Shape" fill="#EB1D1F" transform="translate(7.899495, 7.899495) rotate(45.000000) translate(-7.899495, -7.899495) "></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.3 KiB

7
designer-form/src/main/java/com/fr/design/designer/beans/actions/CopyAction.java
Unescape View File

@ -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;
}
}
}

7
designer-form/src/main/java/com/fr/design/designer/beans/actions/CutAction.java
Unescape View File

@ -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());
}
}
}

5
designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java
Unescape View File

@ -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());
}

7
designer-form/src/main/java/com/fr/design/designer/beans/actions/PasteAction.java
Unescape View File

@ -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);
}
}
}

9
designer-realize/src/main/java/com/fr/design/actions/edit/DeleteAction.java
Unescape View File

@ -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);
}
}

3
designer-realize/src/main/java/com/fr/design/mainframe/FormatBrushAction.java
Unescape View File

@ -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));
}

5
designer-realize/src/main/java/com/fr/poly/actions/DeleteBlockAction.java
Unescape View File

@ -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

11
designer-realize/src/main/java/com/fr/start/MainDesigner.java
Unescape View File

@ -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() {

15
designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java
Unescape View File

@ -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",

Write Preview
Loading…
Cancel
Save