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

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

No.9: 替换了 菜单栏-文件 下的所有子菜单的图标
research/11.0
Yvan 4 years ago
parent
1418ae05fa
commit
3a86570dd3
21 changed files with 116 additions and 32 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      designer-base/src/main/java/com/fr/design/actions/edit/RedoAction.java
  2. 5
      designer-base/src/main/java/com/fr/design/actions/edit/UndoAction.java
  3. 4
      designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java
  4. 4
      designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java
  5. 8
      designer-base/src/main/java/com/fr/design/actions/file/SwitchExistEnv.java
  6. 2
      designer-base/src/main/java/com/fr/design/menu/MenuDef.java
  7. 8
      designer-base/src/main/resources/com/fr/design/images/buttonicon/new_form_for_dock_normal.svg
  8. 11
      designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts_normal.svg
  9. 7
      designer-base/src/main/resources/com/fr/design/images/buttonicon/open_normal.svg
  10. 10
      designer-base/src/main/resources/com/fr/design/images/data/bind/distance_connect_normal.svg
  11. 8
      designer-base/src/main/resources/com/fr/design/images/data/bind/local_connect_normal.svg
  12. 8
      designer-base/src/main/resources/com/fr/design/images/m_file/export_normal.svg
  13. 11
      designer-base/src/main/resources/com/fr/design/images/m_file/formExport_normal.svg
  14. 7
      designer-base/src/main/resources/com/fr/design/images/m_file/saveAs_normal.svg
  15. 7
      designer-base/src/main/resources/com/fr/design/images/m_file/switch_normal.svg
  16. 4
      designer-form/src/main/java/com/fr/design/actions/NewFormAction.java
  17. 2
      designer-form/src/main/java/com/fr/design/mainframe/JForm.java
  18. 4
      designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java
  19. 4
      designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java
  20. 2
      designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
  21. 7
      designer-realize/src/main/java/com/fr/start/preload/ImagePreLoader.java

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

@ -5,7 +5,7 @@ package com.fr.design.actions.edit;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.TemplateComponentActionInterface; import com.fr.design.actions.TemplateComponentActionInterface;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
@ -23,7 +23,8 @@ public class RedoAction extends UpdateAction implements TemplateComponentActionI
this.setMenuKeySet(KeySetUtils.REDO); this.setMenuKeySet(KeySetUtils.REDO);
this.setName(getMenuKeySet().getMenuKeySetName()); this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/redo.png")); this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/redo_normal.svg"));
this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/redo_disabled.svg"));
this.setAccelerator(getMenuKeySet().getKeyStroke()); this.setAccelerator(getMenuKeySet().getKeyStroke());
} }

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

@ -5,7 +5,7 @@ package com.fr.design.actions.edit;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.actions.TemplateComponentActionInterface; import com.fr.design.actions.TemplateComponentActionInterface;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
@ -23,7 +23,8 @@ public class UndoAction extends UpdateAction implements TemplateComponentActionI
this.setMenuKeySet(KeySetUtils.UNDO); this.setMenuKeySet(KeySetUtils.UNDO);
this.setName(getMenuKeySet().getMenuKeySetName()); this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_edit/undo.png")); this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/undo_normal.svg"));
this.setDisabledIcon(SVGIcon.readSVGIcon("com/fr/design/images/buttonicon/undo_disabled.svg"));
this.setAccelerator(getMenuKeySet().getKeyStroke()); this.setAccelerator(getMenuKeySet().getKeyStroke());
} }

4
designer-base/src/main/java/com/fr/design/actions/file/OpenTemplateAction.java
Unescape View File

@ -5,7 +5,7 @@ package com.fr.design.actions.file;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.menu.KeySetUtils; import com.fr.design.menu.KeySetUtils;
@ -22,7 +22,7 @@ public class OpenTemplateAction extends UpdateAction {
this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE); this.setMenuKeySet(KeySetUtils.OPEN_TEMPLATE);
this.setName(getMenuKeySet().getMenuKeySetName()); this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/open.png")); this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/open_normal.svg"));
this.setAccelerator(getMenuKeySet().getKeyStroke()); this.setAccelerator(getMenuKeySet().getKeyStroke());
} }

4
designer-base/src/main/java/com/fr/design/actions/file/SaveAsTemplateAction.java
Unescape View File

@ -5,7 +5,7 @@ package com.fr.design.actions.file;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.JTemplateAction; import com.fr.design.actions.JTemplateAction;
import com.fr.design.mainframe.JTemplate; import com.fr.design.mainframe.JTemplate;
import com.fr.design.menu.KeySetUtils; import com.fr.design.menu.KeySetUtils;
@ -20,7 +20,7 @@ public class SaveAsTemplateAction extends JTemplateAction<JTemplate<?, ?>> {
this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE); this.setMenuKeySet(KeySetUtils.SAVE_AS_TEMPLATE);
this.setName(getMenuKeySet().getMenuKeySetName() + "..."); this.setName(getMenuKeySet().getMenuKeySetName() + "...");
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/saveAs.png")); this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/saveAs_normal.svg"));
} }
/** /**

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

@ -1,6 +1,6 @@
package com.fr.design.actions.file; package com.fr.design.actions.file;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.DesignerEnvManager; import com.fr.design.DesignerEnvManager;
import com.fr.design.EnvChangeEntrance; import com.fr.design.EnvChangeEntrance;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
@ -25,7 +25,7 @@ public class SwitchExistEnv extends MenuDef {
Iterator<String> nameIt = DesignerEnvManager.getEnvManager().getEnvNameIterator(); Iterator<String> nameIt = DesignerEnvManager.getEnvManager().getEnvNameIterator();
while (nameIt.hasNext()) { while (nameIt.hasNext()) {
String name = nameIt.next(); String name = nameIt.next();
this.setIconPath("com/fr/design/images/m_file/switch.png"); this.setIconPath("com/fr/design/images/m_file/switch_normal.svg", true);
this.addShortCut(new GetExistEnvAction(name)); this.addShortCut(new GetExistEnvAction(name));
} }
this.addShortCut(SeparatorDef.DEFAULT); this.addShortCut(SeparatorDef.DEFAULT);
@ -42,11 +42,11 @@ public class SwitchExistEnv extends MenuDef {
DesignerWorkspaceInfo env = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName); DesignerWorkspaceInfo env = DesignerEnvManager.getEnvManager().getWorkspaceInfo(envName);
switch (env.getType()) { switch (env.getType()) {
case Local: { case Local: {
this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/data/bind/localconnect.png")); this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/data/bind/local_connect_normal.svg"));
break; break;
} }
case Remote: { case Remote: {
this.setSmallIcon(BaseUtils.readIcon("com/fr/design/images/data/bind/distanceconnect.png")); this.setSmallIcon(SVGIcon.readSVGIcon("com/fr/design/images/data/bind/distance_connect_normal.svg"));
break; break;
} }
} }

2
designer-base/src/main/java/com/fr/design/menu/MenuDef.java
Unescape View File

@ -201,7 +201,7 @@ public class MenuDef extends ShortCut {
createdJMenu = createJMenu0(); createdJMenu = createJMenu0();
createdJMenu.setMnemonic(this.getMnemonic()); createdJMenu.setMnemonic(this.getMnemonic());
if (this.iconPath != null) { if (this.iconPath != null) {
createdJMenu.setIcon(BaseUtils.readIcon(this.iconPath)); createdJMenu.setIcon(isSVGIcon ? SVGIcon.readSVGIcon(iconPath) : BaseUtils.readIcon(iconPath));
} }
MenuListener menuListener = createMenuListener(); MenuListener menuListener = createMenuListener();
createdJMenu.addMenuListener(menuListener); createdJMenu.addMenuListener(menuListener);

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

@ -0,0 +1,8 @@
<?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="M12,-8.13151629e-20 L12,0.0008 L15.9998,4.0008 L15.9998,15.9998 L1.9998,15.9998 L1.999,13.9998 L0,14.0004 L0,3.0004 L1.999,2.9998 L1.9998,-0.0002 L12,-8.13151629e-20 Z M15,4.9998 L12,4.9998 L14,7.0004 L14,14.0004 L2.999,13.9998 L2.9998,14.9998 L15.0008,14.9998 L15,4.9998 Z M9,4 L1,4 L1,13 L13,13 L13,8 L9,8 L9,4 Z M4,9 L4,11 L2,11 L2,9 L4,9 Z M12,9 L12,11 L5,11 L5,9 L12,9 Z M4,6 L4,8 L2,8 L2,6 L4,6 Z M8,6 L8,8 L5,8 L5,6 L8,6 Z M12,1.4148 L12,3.9998 L14.586,3.9998 L12,1.4148 Z M11,0.9998 L2.9998,0.9998 L2.999,2.9998 L10,3.0004 L11,3.9998 L11,0.9998 Z" id="Combined-Shape" fill="#333334"></path>
<polygon id="Fill-7" fill="#FFFFFF" points="12 7 10 5 10 7 11 7"></polygon>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

11
designer-base/src/main/resources/com/fr/design/images/buttonicon/newcpts_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">
<g id="Group" transform="translate(1.000000, 1.000000)">
<path d="M13,5 L5,5 L5,13 L0,13 L0,0 L13,0 L13,5 Z M4,9 L1,9 L1,12 L4,12 L4,9 Z M4,5 L1,5 L1,8 L4,8 L4,5 Z M12,1 L9,1 L9,4 L12,4 L12,1 Z M8,1 L5,1 L5,4 L8,4 L8,1 Z M4,1 L1,1 L1,4 L4,4 L4,1 Z" id="Combined-Shape" fill="#333334" transform="translate(6.500000, 6.500000) scale(-1, 1) translate(-6.500000, -6.500000) "></path>
<path d="M2,6 L2,9 L4,9 L4,11 L2,11 L2,13 L0,13 L0,7.00292933 C0,6.44902676 0.443864822,6 1,6 L2,6 Z" id="Combined-Shape" fill="#0757A1"></path>
<path d="M3,8 L3,6 L7,6 L7,12.0001925 C7,12.5523709 6.55613518,13 6,13 L5,13 L5,8 L3,8 Z" id="Combined-Shape" fill="#3BAAE0"></path>
</g>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/buttonicon/open_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="M13.272,12.787 C13.25,12.875 13.09,13 13,13 L12,13 L7.5,13 L6,13 L4.5,13 L1.387,13 L2.632,9.265 C2.67,9.151 2.879,9 3,9 L6,9 C6.922,9 7.929,8.378 8.341,7.553 L8.447,7.342 C8.523,7.188 8.828,7 9,7 L14.719,7 L13.272,12.787 Z M5,3 C5.038,3 5.072,3.002 5.103,3.005 C5.361,3.603 6.081,4 7,4 L13,4 L13,6 L9,6 C8.45,6 7.798,6.402 7.552,6.894 L7.447,7.105 C7.201,7.598 6.549,8 6,8 L3,8 C2.45,8 1.857,8.427 1.683,8.949 L1,11 L1,3 L5,3 Z M15,6 L14,6 L14,4 C14,3.45 13.549,3 13,3 L7,3 C6.45,3 6,2.775 6,2.5 C6,2.225 5.549,2 5,2 L1,2 C0.45,2 0,2.45 0,3 L0,13 C0,13.55 0.45,14 1,14 L4.5,14 L6,14 L7.5,14 L13,14 C13.549,14 14.108,13.563 14.242,13.03 L15.757,6.97 C15.891,6.436 15.549,6 15,6 L15,6 Z" id="Fill-1" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

10
designer-base/src/main/resources/com/fr/design/images/data/bind/distance_connect_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_distanceconnect_normal</title>
<g id="icon_distanceconnect_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<path d="M8,15 C11.8659932,15 15,11.8659932 15,8 C15,4.13400675 11.8659932,1 8,1 C4.13400675,1 1,4.13400675 1,8 C1,11.8659932 4.13400675,15 8,15 Z M8,16 C3.581722,16 0,12.418278 0,8 C0,3.581722 3.581722,0 8,0 C12.418278,0 16,3.581722 16,8 C16,12.418278 12.418278,16 8,16 Z" id="Oval-9" fill="#333334" fill-rule="nonzero"></path>
<path d="M8,15 C10.6887085,15 13,11.918278 13,8 C13,4.081722 10.6887085,1 8,1 C5.3112915,1 3,4.081722 3,8 C3,11.918278 5.3112915,15 8,15 Z M8,16 C4.6862915,16 2,12.418278 2,8 C2,3.581722 4.6862915,0 8,0 C11.3137085,0 14,3.581722 14,8 C14,12.418278 11.3137085,16 8,16 Z" id="Oval-9" fill="#333334" fill-rule="nonzero"></path>
<path d="M8,15 C8.83702029,15 10,11.8987208 10,8 C10,4.10127922 8.83702029,1 8,1 C7.16297971,1 6,4.10127922 6,8 C6,11.8987208 7.16297971,15 8,15 Z M8,16 C6.34314575,16 5,12.418278 5,8 C5,3.581722 6.34314575,0 8,0 C9.65685425,0 11,3.581722 11,8 C11,12.418278 9.65685425,16 8,16 Z" id="Oval-9" fill="#333334" fill-rule="nonzero"></path>
<path d="M8,15 C8.83702029,15 10,11.8987208 10,8 C10,4.10127922 8.83702029,1 8,1 C7.16297971,1 6,4.10127922 6,8 C6,11.8987208 7.16297971,15 8,15 Z M8,16 C6.34314575,16 5,12.418278 5,8 C5,3.581722 6.34314575,0 8,0 C9.65685425,0 11,3.581722 11,8 C11,12.418278 9.65685425,16 8,16 Z" id="Oval-9" fill="#333334" fill-rule="nonzero" transform="translate(8.000000, 8.000000) rotate(90.000000) translate(-8.000000, -8.000000) "></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.8 KiB

8
designer-base/src/main/resources/com/fr/design/images/data/bind/local_connect_normal.svg
Unescape View File

@ -0,0 +1,8 @@
<?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_HomeFolderIcon_normal</title>
<g id="icon_HomeFolderIcon_normal" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
<polygon id="Fill-1" fill="#DBDCDC" points="7.9092 4.0003 8.0912 4.0003 8.0002 3.9093"></polygon>
<path d="M8.0001,0.9997 L16.0001,8.9997 L14.5461,10.4537 L14.0001,9.9077 L14.001,16 L2,16 L1.9991,9.9077 L1.4541,10.4537 L0.0001,8.9997 L8.0001,0.9997 Z M8.0001,3.9077 L2.9071,8.9997 L3,9 L2.9991,14.9997 L13,15 L13,9 L13.0921,8.9997 L8.0001,3.9077 Z M10,10 L10,14 L6,14 L6,10 L10,10 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 791 B

8
designer-base/src/main/resources/com/fr/design/images/m_file/export_normal.svg
Unescape View File

@ -0,0 +1,8 @@
<?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="M14.001,5.0002 L10.0002,5.0002 L10.0002,1 L2,1 L2,15 L14.001,15 L14.001,5.0002 Z M13.5862,4.0002 L11.0002,1.4142 L11.0002,4.0002 L13.5862,4.0002 L13.5862,4.0002 Z M1,0 L11,0 L15,4.001 L15,16 L1,16 L1,12 L2.0002,13 L2.0002,6 L1,7 L1,0 Z" id="Combined-Shape" fill="#333334" transform="translate(8.000000, 8.000000) rotate(180.000000) translate(-8.000000, -8.000000) "></path>
<path d="M11.3,2.4890598 C11.3856913,2.4890598 11.4672926,2.52570414 11.5242228,2.58975065 L15,6.5 L11.5242228,10.4102494 C11.4141474,10.5340842 11.2245257,10.5452384 11.1006908,10.435163 C11.0366443,10.3782328 11,10.2966315 11,10.2109402 L11,7.9990598 L6,8 L6,5 L11,4.9990598 L11,2.7890598 C11,2.62337437 11.1343146,2.4890598 11.3,2.4890598 Z" id="Combined-Shape" fill="#3FB053"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.1 KiB

11
designer-base/src/main/resources/com/fr/design/images/m_file/formExport_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="M15,0 L15,15 L0,15 L0,0 L15,0 Z M1,3 L1,14 L14,14 L14,3 L1,3 Z M14,2 L14,1 L13,1 L13,2 L14,2 Z M1,2 L11,2 L11,1 L10,1 L10,2 L8,2 L8,1 L7,1 L7,2 L5,2 L5,1 L4,1 L4,2 L2,2 L2,1 L1,1 L1,2 Z" id="Combined-Shape" fill="#333334"></path>
<polygon id="Fill-8" fill="#333334" points="3 7 6.001 7 6.001 6 3 6"></polygon>
<polygon id="Fill-9" fill="#333334" points="3 11 6.001 11 6.001 9.999 3 9.999"></polygon>
<path d="M12,5 L12,8 L8,8 L8,5 L12,5 Z M11,6 L9,6 L9,7 L11,7 L11,6 Z" id="Combined-Shape" fill="#333334"></path>
<path d="M12,9 L12,12 L8,12 L8,9 L12,9 Z M11,9.999 L9,9.999 L9,11 L11,11 L11,9.999 Z" id="Combined-Shape" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.0 KiB

7
designer-base/src/main/resources/com/fr/design/images/m_file/saveAs_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="M2,1 L11,1 C11.5522847,1 12,1.44771525 12,2 L12,11 C12,11.5522847 11.5522847,12 11,12 L2,12 C1.44771525,12 1,11.5522847 1,11 L1,2 C1,1.44771525 1.44771525,1 2,1 Z M2,2 L2,11 L11,11 L11,2 L2,2 Z M3,2 L8,2 L8,5 L3,5 L3,2 Z M6,2 L6,4 L7,4 L7,2 L6,2 Z M7,13 L9,13 L9,15 L7,15 L7,13 Z M10,13 L12,13 L12,15 L10,15 L10,13 Z M13,13 L15,13 L15,15 L13,15 L13,13 Z" id="Combined-Shape" fill="#333334" fill-rule="nonzero"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 773 B

7
designer-base/src/main/resources/com/fr/design/images/m_file/switch_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="M12.0156025,5.51600978 L11.7682186,5.75374397 C11.4296009,6.09762516 11.4296009,6.65380036 11.7682186,6.99768156 C12.1077135,7.34156275 12.6568707,7.34156275 12.9963657,6.99768156 L14.7455981,5.28003008 C14.907889,5.11510746 15,4.89228648 15,4.65806128 C15,4.42471333 14.907889,4.2010151 14.7455981,4.03609249 L12.9884705,2.2579109 C12.6498527,1.9140297 12.1006955,1.9140297 11.7612006,2.2579109 C11.4225829,2.60091484 11.4225829,3.15709004 11.7612006,3.50097124 L12.0234977,3.76677737 L9.74791654,3.76677737 C9.49263738,3.76677737 9.2496397,3.87818786 9.08383984,4.07205965 L4.07036782,10.7645842 L1.8746162,10.7645842 C1.39125258,10.7645842 1,11.1558368 1,11.6392005 C1,12.1234413 1.39125258,12.5146939 1.8746162,12.5146939 L4.49934206,12.5146939 C4.75462122,12.5146939 4.99674165,12.4024062 5.16254151,12.2085344 L10.1505733,5.51600978 L12.0156025,5.51600978 Z M12.9963657,9.28291246 C12.6568707,8.93990852 12.1077135,8.93990852 11.7682186,9.28291246 C11.4296009,9.62679366 11.4296009,10.1829689 11.7682186,10.5259728 L12.0156025,10.7645842 L10.1505733,10.7645842 L9.35666395,9.70048249 L8.13378031,10.9330159 L9.08383984,12.2085344 C9.2496397,12.4024062 9.49263738,12.5146939 9.74791654,12.5146939 L12.0234977,12.5146939 L11.7612006,12.7805 C11.4225829,13.123504 11.4225829,13.6796792 11.7612006,14.0235604 C12.1006955,14.3665643 12.6498527,14.3665643 12.9884705,14.0235604 L14.7455981,12.2445015 C14.907889,12.0795789 15,11.8558807 15,11.6225327 C15,11.3891848 14.907889,11.1654866 14.7455981,11.0005639 L12.9963657,9.28291246 Z M1.8746162,5.51600978 L4.07036782,5.51600978 L4.85813647,6.53800363 L6.08102011,5.30459302 L5.16254151,4.07205965 C4.99674165,3.87818786 4.75462122,3.76677737 4.49934206,3.76677737 L1.8746162,3.76677737 C1.39125258,3.76677737 1,4.15802995 1,4.64139357 C1,5.12475719 1.39125258,5.51600978 1.8746162,5.51600978 L1.8746162,5.51600978 Z" id="Fill-1" fill="#333334"></path>
</g>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 2.2 KiB

4
designer-form/src/main/java/com/fr/design/actions/NewFormAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions; package com.fr.design.actions;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.mainframe.BaseJForm; import com.fr.design.mainframe.BaseJForm;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
@ -21,7 +21,7 @@ public class NewFormAction extends UpdateAction {
this.setMenuKeySet(NEW_FORM); this.setMenuKeySet(NEW_FORM);
this.setName(getMenuKeySet().getMenuKeySetName()); this.setName(getMenuKeySet().getMenuKeySetName());
this.setMnemonic(getMenuKeySet().getMnemonic()); this.setMnemonic(getMenuKeySet().getMnemonic());
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/buttonicon/new_form3.png")); this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/new_form_for_dock_normal.svg"));
this.setAccelerator(getMenuKeySet().getKeyStroke()); this.setAccelerator(getMenuKeySet().getKeyStroke());
} }

2
designer-form/src/main/java/com/fr/design/mainframe/JForm.java
Unescape View File

@ -247,7 +247,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
private MenuDef createWorkBookExportMenu() { private MenuDef createWorkBookExportMenu() {
MenuDef exportMenuDef = new MenuDef(KeySetUtils.EXPORT.getMenuName()); MenuDef exportMenuDef = new MenuDef(KeySetUtils.EXPORT.getMenuName());
exportMenuDef.setIconPath("/com/fr/design/images/m_file/export.png"); exportMenuDef.setIconPath("/com/fr/design/images/m_file/export_normal.svg", true);
exportMenuDef.addShortCut(new EmbeddedFormExportExportAction(this)); exportMenuDef.addShortCut(new EmbeddedFormExportExportAction(this));
return exportMenuDef; return exportMenuDef;

4
designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewPolyReportAction.java
Unescape View File

@ -5,7 +5,7 @@ import java.awt.event.KeyEvent;
import javax.swing.KeyStroke; import javax.swing.KeyStroke;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JPolyWorkBook; import com.fr.design.mainframe.JPolyWorkBook;
@ -18,7 +18,7 @@ public class NewPolyReportAction extends UpdateAction {
public NewPolyReportAction() { public NewPolyReportAction() {
this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Multi_Report")); this.setName(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_M_New_Multi_Report"));
this.setMnemonic('F'); this.setMnemonic('F');
this.setSmallIcon(BaseUtils.readIcon("/com/fr/design/images/m_file/formExport.png")); this.setSmallIcon(SVGIcon.readSVGIcon("/com/fr/design/images/m_file/formExport_normal.svg"));
this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER)); this.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_M, DEFAULT_MODIFIER));
} }

4
designer-realize/src/main/java/com/fr/design/actions/file/newReport/NewWorkBookAction.java
Unescape View File

@ -1,6 +1,6 @@
package com.fr.design.actions.file.newReport; package com.fr.design.actions.file.newReport;
import com.fr.base.BaseUtils; import com.fr.base.svg.SVGIcon;
import com.fr.design.actions.UpdateAction; import com.fr.design.actions.UpdateAction;
import com.fr.design.mainframe.DesignerContext; import com.fr.design.mainframe.DesignerContext;
import com.fr.design.mainframe.JWorkBook; import com.fr.design.mainframe.JWorkBook;
@ -25,7 +25,7 @@ public class NewWorkBookAction extends UpdateAction {
} }
protected Icon icon() { protected Icon icon() {
return BaseUtils.readIcon("/com/fr/design/images/buttonicon/newcpts.png"); return SVGIcon.readSVGIcon("/com/fr/design/images/buttonicon/newcpts_normal.svg");
} }
/** /**

2
designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java
Unescape View File

@ -690,7 +690,7 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
.addShortCut(new PageExcelExportAction(this), new ExcelExportAction(this), new PageToSheetExcelExportAction(this)); .addShortCut(new PageExcelExportAction(this), new ExcelExportAction(this), new PageToSheetExcelExportAction(this));
// Export - MenuDef // Export - MenuDef
MenuDef exportMenuDef = new MenuDef(KeySetUtils.EXPORT.getMenuName()); MenuDef exportMenuDef = new MenuDef(KeySetUtils.EXPORT.getMenuName());
exportMenuDef.setIconPath("/com/fr/design/images/m_file/export.png"); exportMenuDef.setIconPath("/com/fr/design/images/m_file/export_normal.svg", true);
addShortCut(exportMenuDef, excelExportMenuDef); addShortCut(exportMenuDef, excelExportMenuDef);
return exportMenuDef; return exportMenuDef;
} }

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

@ -46,7 +46,8 @@ public class ImagePreLoader {
private String[] preLoadImages = { private String[] preLoadImages = {
"com/fr/design/images/m_file/formExport.png", "com/fr/design/images/m_file/formExport.png",
"com/fr/base/images/oem/cpt.png", "com/fr/design/images/m_file/formExport_normal.svg",
"com/fr/base/images/oem/cpt.xpng",
"com/fr/design/images/data/store_procedure.png", "com/fr/design/images/data/store_procedure.png",
"/com/fr/design/images/m_file/preview.png", "/com/fr/design/images/m_file/preview.png",
"com/fr/base/images/cell/blank.gif", "com/fr/base/images/cell/blank.gif",
@ -111,6 +112,7 @@ public class ImagePreLoader {
"com/fr/design/images/buttonicon/mouseoverclose icon.png", "com/fr/design/images/buttonicon/mouseoverclose icon.png",
"com/fr/design/images/buttonicon/pressclose icon.png", "com/fr/design/images/buttonicon/pressclose icon.png",
"com/fr/design/images/buttonicon/open.png", "com/fr/design/images/buttonicon/open.png",
"com/fr/design/images/buttonicon/open_normal.svg",
"com/fr/design/images/m_file/view_folder.png", "com/fr/design/images/m_file/view_folder.png",
"com/fr/design/images/data/source/rename.png", "com/fr/design/images/data/source/rename.png",
"com/fr/design/images/buttonicon/minus.png", "com/fr/design/images/buttonicon/minus.png",
@ -144,6 +146,7 @@ public class ImagePreLoader {
"com/fr/design/images/log/selectedall.png", "com/fr/design/images/log/selectedall.png",
"com/fr/design/images/log/setting.png", "com/fr/design/images/log/setting.png",
"com/fr/design/images/buttonicon/newcpts.png", "com/fr/design/images/buttonicon/newcpts.png",
"com/fr/design/images/buttonicon/newcpts_normal.svg",
"com/fr/base/images/oem/logo.png", "com/fr/base/images/oem/logo.png",
"com/fr/design/images/data/bind/localconnect.png", "com/fr/design/images/data/bind/localconnect.png",
"com/fr/design/images/gui/tab_add_normal.png", "com/fr/design/images/gui/tab_add_normal.png",
@ -343,8 +346,10 @@ public class ImagePreLoader {
"com/fr/design/images/control/refresh.png", "com/fr/design/images/control/refresh.png",
"com/fr/design/images/toolbarbtn/close.png", "com/fr/design/images/toolbarbtn/close.png",
"com/fr/design/images/buttonicon/new_form3.png", "com/fr/design/images/buttonicon/new_form3.png",
"com/fr/design/images/buttonicon/new_form_for_dock_normal.svg",
"com/fr/design/images/m_file/save.png", "com/fr/design/images/m_file/save.png",
"com/fr/design/images/m_file/saveAs.png", "com/fr/design/images/m_file/saveAs.png",
"com/fr/design/images/m_file/saveAs_normal.svg",
"com/fr/design/images/m_edit/undo.png", "com/fr/design/images/m_edit/undo.png",
"com/fr/design/images/m_edit/redo.png", "com/fr/design/images/m_edit/redo.png",
"com/fr/design/images/m_file/excel.png", "com/fr/design/images/m_file/excel.png",

Write Preview
Loading…
Cancel
Save